diff --git a/.gitmodules b/.gitmodules index b7106566b4..07ed87e91f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "libraries/LGLibrary"] path = libraries/LGLibrary - url = git@git.ghzs.com:android/common-library.git + url = git@git.shanqu.cc:android/common-library.git branch = master [submodule "assistant_flutter"] path = assistant_flutter - url = git@git.ghzs.com:halo/android/flutter-module.git + url = git@git.shanqu.cc:halo/android/flutter-module.git diff --git a/app/build.gradle b/app/build.gradle index 68cd685ace..4b76722ff7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,7 @@ // This comment exists for a reason, do not delete apply plugin: 'com.android.application' apply plugin: 'kotlin-android' // kotlin -apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-parcelize' apply plugin: 'kotlin-kapt' apply plugin: 'AndResGuard' @@ -9,13 +9,9 @@ import groovy.xml.XmlUtil android { - androidExtensions { - experimental = true - } - buildFeatures { - viewBinding = true - dataBinding = true + viewBinding true + dataBinding true } compileOptions { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 092e18a018..fd47cf597e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -242,11 +242,6 @@ android:screenOrientation="portrait" android:windowSoftInputMode="stateAlwaysHidden|adjustResize" /> - - - - - - @@ -318,14 +305,6 @@ android:name="com.gh.gamecenter.MessageKeFuActivity" android:screenOrientation="portrait" /> - - - - @@ -342,10 +321,6 @@ android:name="com.gh.gamecenter.qa.myqa.MyAskActivity" android:screenOrientation="portrait" /> - - @@ -367,10 +342,6 @@ android:name="com.gh.gamecenter.amway.AmwayActivity" android:screenOrientation="portrait" /> - - @@ -457,10 +428,6 @@ android:name="com.gh.gamecenter.tag.TagsActivity" android:screenOrientation="portrait" /> - - @@ -833,48 +800,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_border_1383eb_oval.xml b/app/src/main/res/drawable/button_border_1383eb_oval.xml deleted file mode 100644 index 36a9716d72..0000000000 --- a/app/src/main/res/drawable/button_border_1383eb_oval.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_d5_bg.xml b/app/src/main/res/drawable/button_d5_bg.xml deleted file mode 100644 index c7ad96abf6..0000000000 --- a/app/src/main/res/drawable/button_d5_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_normal_round_style.xml b/app/src/main/res/drawable/button_normal_round_style.xml index 8ba4f3fc15..d74cf4db69 100644 --- a/app/src/main/res/drawable/button_normal_round_style.xml +++ b/app/src/main/res/drawable/button_normal_round_style.xml @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_2496ff.xml b/app/src/main/res/drawable/button_round_2496ff.xml deleted file mode 100644 index 359f3cf3d3..0000000000 --- a/app/src/main/res/drawable/button_round_2496ff.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_2496ff_alpha_40.xml b/app/src/main/res/drawable/button_round_2496ff_alpha_40.xml deleted file mode 100644 index b461c34da3..0000000000 --- a/app/src/main/res/drawable/button_round_2496ff_alpha_40.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_ebfdff.xml b/app/src/main/res/drawable/button_round_ebfdff.xml deleted file mode 100644 index 268a1fd6e2..0000000000 --- a/app/src/main/res/drawable/button_round_ebfdff.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_round_f0f8ff.xml b/app/src/main/res/drawable/button_round_f0f8ff.xml deleted file mode 100644 index 54f327c352..0000000000 --- a/app/src/main/res/drawable/button_round_f0f8ff.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/calendar_bar_bg.xml b/app/src/main/res/drawable/calendar_bar_bg.xml deleted file mode 100644 index 8e347b7649..0000000000 --- a/app/src/main/res/drawable/calendar_bar_bg.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/calendar_bar_select.xml b/app/src/main/res/drawable/calendar_bar_select.xml deleted file mode 100644 index bf6acba0f9..0000000000 --- a/app/src/main/res/drawable/calendar_bar_select.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/comment_send_button_available.xml b/app/src/main/res/drawable/comment_send_button_available.xml deleted file mode 100644 index 359f3cf3d3..0000000000 --- a/app/src/main/res/drawable/comment_send_button_available.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/comment_send_button_selector.xml b/app/src/main/res/drawable/comment_send_button_selector.xml index e39c976df6..e32ebeafb1 100644 --- a/app/src/main/res/drawable/comment_send_button_selector.xml +++ b/app/src/main/res/drawable/comment_send_button_selector.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/comment_send_button_unavailable.xml b/app/src/main/res/drawable/comment_send_button_unavailable.xml deleted file mode 100644 index f74c59736f..0000000000 --- a/app/src/main/res/drawable/comment_send_button_unavailable.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/community_content_detail_vote_background.xml b/app/src/main/res/drawable/community_content_detail_vote_background.xml deleted file mode 100644 index da7df63ef9..0000000000 --- a/app/src/main/res/drawable/community_content_detail_vote_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/community_image_more_background.xml b/app/src/main/res/drawable/community_image_more_background.xml deleted file mode 100644 index 712250d5f2..0000000000 --- a/app/src/main/res/drawable/community_image_more_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/community_vote_selector.xml b/app/src/main/res/drawable/community_vote_selector.xml index f9c2f6ef7a..2e3da8d639 100644 --- a/app/src/main/res/drawable/community_vote_selector.xml +++ b/app/src/main/res/drawable/community_vote_selector.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_download_none_rect_style.xml b/app/src/main/res/drawable/detail_download_none_rect_style.xml deleted file mode 100644 index 2a9bad72a2..0000000000 --- a/app/src/main/res/drawable/detail_download_none_rect_style.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_download_normal_image_style.xml b/app/src/main/res/drawable/detail_download_normal_image_style.xml deleted file mode 100644 index 0f32e68d0b..0000000000 --- a/app/src/main/res/drawable/detail_download_normal_image_style.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_download_normal_rect_style.xml b/app/src/main/res/drawable/detail_download_normal_rect_style.xml deleted file mode 100644 index d61211136a..0000000000 --- a/app/src/main/res/drawable/detail_download_normal_rect_style.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_download_open_rect_style.xml b/app/src/main/res/drawable/detail_download_open_rect_style.xml deleted file mode 100644 index d2b8708441..0000000000 --- a/app/src/main/res/drawable/detail_download_open_rect_style.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_download_plugin_install_rect_style.xml b/app/src/main/res/drawable/detail_download_plugin_install_rect_style.xml deleted file mode 100644 index b577bf9c6c..0000000000 --- a/app/src/main/res/drawable/detail_download_plugin_install_rect_style.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml b/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml deleted file mode 100644 index cbe07eff1c..0000000000 --- a/app/src/main/res/drawable/detail_downloading_plugin_rect_style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/detail_downloading_plugin_style.xml b/app/src/main/res/drawable/detail_downloading_plugin_style.xml deleted file mode 100644 index f63ffdaaf4..0000000000 --- a/app/src/main/res/drawable/detail_downloading_plugin_style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_communities_select_title_bg.xml b/app/src/main/res/drawable/dialog_communities_select_title_bg.xml deleted file mode 100644 index 0f32e68d0b..0000000000 --- a/app/src/main/res/drawable/dialog_communities_select_title_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_community_negative.xml b/app/src/main/res/drawable/dialog_community_negative.xml deleted file mode 100644 index f78fb39c6a..0000000000 --- a/app/src/main/res/drawable/dialog_community_negative.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/dialog_community_positive.xml b/app/src/main/res/drawable/dialog_community_positive.xml deleted file mode 100644 index 98cfe65f3b..0000000000 --- a/app/src/main/res/drawable/dialog_community_positive.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/dialog_privacy_background.xml b/app/src/main/res/drawable/dialog_privacy_background.xml deleted file mode 100644 index beae2f074e..0000000000 --- a/app/src/main/res/drawable/dialog_privacy_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/download_dialog_item_install_base_background.xml b/app/src/main/res/drawable/download_dialog_item_install_base_background.xml deleted file mode 100644 index 942d8a6ec0..0000000000 --- a/app/src/main/res/drawable/download_dialog_item_install_base_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/package_check_complete_bg.xml b/app/src/main/res/drawable/download_recommend_des_bg.xml similarity index 51% rename from app/src/main/res/drawable/package_check_complete_bg.xml rename to app/src/main/res/drawable/download_recommend_des_bg.xml index 47afa8527b..4266a072fe 100644 --- a/app/src/main/res/drawable/package_check_complete_bg.xml +++ b/app/src/main/res/drawable/download_recommend_des_bg.xml @@ -1,11 +1,10 @@ - - + android:centerColor="#7FB9F8" + android:startColor="#7AD0F7" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/et_line.xml b/app/src/main/res/drawable/et_line.xml deleted file mode 100644 index 1bf75e0314..0000000000 --- a/app/src/main/res/drawable/et_line.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/et_line_login.xml b/app/src/main/res/drawable/et_line_login.xml deleted file mode 100644 index c96d1b20b3..0000000000 --- a/app/src/main/res/drawable/et_line_login.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/full_dialog_background.xml b/app/src/main/res/drawable/full_dialog_background.xml deleted file mode 100644 index ed7aaa9414..0000000000 --- a/app/src/main/res/drawable/full_dialog_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_collection_vote_selector.xml b/app/src/main/res/drawable/game_collection_vote_selector.xml index a39bd3fab7..763108c5ef 100644 --- a/app/src/main/res/drawable/game_collection_vote_selector.xml +++ b/app/src/main/res/drawable/game_collection_vote_selector.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_detail_fuli_btn.xml b/app/src/main/res/drawable/game_detail_fuli_btn.xml deleted file mode 100644 index c7483acf73..0000000000 --- a/app/src/main/res/drawable/game_detail_fuli_btn.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_image_slide_item_background.xml b/app/src/main/res/drawable/game_image_slide_item_background.xml deleted file mode 100644 index 9fabecc859..0000000000 --- a/app/src/main/res/drawable/game_image_slide_item_background.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_download_style.xml b/app/src/main/res/drawable/game_item_btn_download_style.xml index f909f87154..e8bd9cadee 100644 --- a/app/src/main/res/drawable/game_item_btn_download_style.xml +++ b/app/src/main/res/drawable/game_item_btn_download_style.xml @@ -3,6 +3,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_download_up.xml b/app/src/main/res/drawable/game_item_btn_download_up.xml deleted file mode 100644 index 359f3cf3d3..0000000000 --- a/app/src/main/res/drawable/game_item_btn_download_up.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_downloading_bg.xml b/app/src/main/res/drawable/game_item_btn_downloading_bg.xml deleted file mode 100644 index 95b186a8fd..0000000000 --- a/app/src/main/res/drawable/game_item_btn_downloading_bg.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_downloading_style.xml b/app/src/main/res/drawable/game_item_btn_downloading_style.xml index e77f1bbbbc..13b27ee4c4 100644 --- a/app/src/main/res/drawable/game_item_btn_downloading_style.xml +++ b/app/src/main/res/drawable/game_item_btn_downloading_style.xml @@ -1,8 +1,8 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_red_dn.xml b/app/src/main/res/drawable/game_item_btn_red_dn.xml deleted file mode 100644 index 22c5aa2cb9..0000000000 --- a/app/src/main/res/drawable/game_item_btn_red_dn.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_red_style.xml b/app/src/main/res/drawable/game_item_btn_red_style.xml deleted file mode 100644 index 4c86c15844..0000000000 --- a/app/src/main/res/drawable/game_item_btn_red_style.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_item_btn_red_up.xml b/app/src/main/res/drawable/game_item_btn_red_up.xml deleted file mode 100644 index add49a641a..0000000000 --- a/app/src/main/res/drawable/game_item_btn_red_up.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_upload_rg_button_available.xml b/app/src/main/res/drawable/game_upload_rg_button_available.xml deleted file mode 100644 index 359f3cf3d3..0000000000 --- a/app/src/main/res/drawable/game_upload_rg_button_available.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/game_upload_rg_button_selector.xml b/app/src/main/res/drawable/game_upload_rg_button_selector.xml index fd40a09e0c..72553cec63 100644 --- a/app/src/main/res/drawable/game_upload_rg_button_selector.xml +++ b/app/src/main/res/drawable/game_upload_rg_button_selector.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml b/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml deleted file mode 100644 index b72a1f18d9..0000000000 --- a/app/src/main/res/drawable/game_upload_rg_button_unavailable.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/gamedetail_gametag_bg.xml b/app/src/main/res/drawable/gamedetail_gametag_bg.xml deleted file mode 100644 index acec73fe67..0000000000 --- a/app/src/main/res/drawable/gamedetail_gametag_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/gamedetail_related_game_background.xml b/app/src/main/res/drawable/gamedetail_related_game_background.xml deleted file mode 100644 index 38a7e534a6..0000000000 --- a/app/src/main/res/drawable/gamedetail_related_game_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_game_tag_background.xml b/app/src/main/res/drawable/home_game_tag_background.xml deleted file mode 100644 index 296a1f8216..0000000000 --- a/app/src/main/res/drawable/home_game_tag_background.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_selected.xml b/app/src/main/res/drawable/indicator_selected.xml deleted file mode 100644 index e8b377010d..0000000000 --- a/app/src/main/res/drawable/indicator_selected.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/indicator_unselected.xml b/app/src/main/res/drawable/indicator_unselected.xml deleted file mode 100644 index a967aec825..0000000000 --- a/app/src/main/res/drawable/indicator_unselected.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/kaifu_item_hint.xml b/app/src/main/res/drawable/kaifu_item_hint.xml deleted file mode 100644 index d8586bc5ee..0000000000 --- a/app/src/main/res/drawable/kaifu_item_hint.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/kaifu_item_hint_gray.xml b/app/src/main/res/drawable/kaifu_item_hint_gray.xml deleted file mode 100644 index f08dcdbe02..0000000000 --- a/app/src/main/res/drawable/kaifu_item_hint_gray.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/kaifu_time_tag_gray.xml b/app/src/main/res/drawable/kaifu_time_tag_gray.xml deleted file mode 100644 index 9f6d28516b..0000000000 --- a/app/src/main/res/drawable/kaifu_time_tag_gray.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/list_unread_item_style.xml b/app/src/main/res/drawable/list_unread_item_style.xml deleted file mode 100644 index 9e8bd394bb..0000000000 --- a/app/src/main/res/drawable/list_unread_item_style.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/menu_ic_concern.xml b/app/src/main/res/drawable/menu_ic_concern.xml deleted file mode 100644 index 7cde3b7e6f..0000000000 --- a/app/src/main/res/drawable/menu_ic_concern.xml +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/drawable/news_detail_comment.xml b/app/src/main/res/drawable/news_detail_comment.xml deleted file mode 100644 index 9aaed6d4f7..0000000000 --- a/app/src/main/res/drawable/news_detail_comment.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_download_hint_bg.xml b/app/src/main/res/drawable/oval_download_hint_bg.xml deleted file mode 100644 index e8b377010d..0000000000 --- a/app/src/main/res/drawable/oval_download_hint_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_ebf9fa_bg.xml b/app/src/main/res/drawable/oval_ebf9fa_bg.xml deleted file mode 100644 index e71c0485b2..0000000000 --- a/app/src/main/res/drawable/oval_ebf9fa_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_gray_bg.xml b/app/src/main/res/drawable/oval_gray_bg.xml deleted file mode 100644 index 1804acb162..0000000000 --- a/app/src/main/res/drawable/oval_gray_bg.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_gray_bg.xml b/app/src/main/res/drawable/oval_hint_gray_bg.xml deleted file mode 100644 index b3823f99e2..0000000000 --- a/app/src/main/res/drawable/oval_hint_gray_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_up_blue.xml b/app/src/main/res/drawable/oval_hint_up_blue.xml deleted file mode 100644 index e8b377010d..0000000000 --- a/app/src/main/res/drawable/oval_hint_up_blue.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_hint_white_bg.xml b/app/src/main/res/drawable/oval_hint_white_bg.xml deleted file mode 100644 index 5f81b21a16..0000000000 --- a/app/src/main/res/drawable/oval_hint_white_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/oval_orange_bg.xml b/app/src/main/res/drawable/oval_orange_bg.xml deleted file mode 100644 index 9df1851d53..0000000000 --- a/app/src/main/res/drawable/oval_orange_bg.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_normal_radius_style.xml b/app/src/main/res/drawable/progressbar_normal_radius_style.xml deleted file mode 100644 index a2e0eb2500..0000000000 --- a/app/src/main/res/drawable/progressbar_normal_radius_style.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_played_game_style.xml b/app/src/main/res/drawable/progressbar_played_game_style.xml deleted file mode 100644 index f68bfa3c16..0000000000 --- a/app/src/main/res/drawable/progressbar_played_game_style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_rating_style.xml b/app/src/main/res/drawable/progressbar_rating_style.xml deleted file mode 100644 index 4cb4ffeedd..0000000000 --- a/app/src/main/res/drawable/progressbar_rating_style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_upload_style.xml b/app/src/main/res/drawable/progressbar_upload_style.xml deleted file mode 100644 index 58cc384fa0..0000000000 --- a/app/src/main/res/drawable/progressbar_upload_style.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/progressbar_video_detail_circle.xml b/app/src/main/res/drawable/progressbar_video_detail_circle.xml deleted file mode 100644 index fd7f7f0224..0000000000 --- a/app/src/main/res/drawable/progressbar_video_detail_circle.xml +++ /dev/null @@ -1,18 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/drawable/qa_feedback_rg_button_selector.xml b/app/src/main/res/drawable/qa_feedback_rg_button_selector.xml deleted file mode 100644 index 55bd31e336..0000000000 --- a/app/src/main/res/drawable/qa_feedback_rg_button_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/rating_comment_vote_style.xml b/app/src/main/res/drawable/rating_comment_vote_style.xml deleted file mode 100644 index 8c96a9df20..0000000000 --- a/app/src/main/res/drawable/rating_comment_vote_style.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/round_grey_stroke.xml b/app/src/main/res/drawable/round_grey_stroke.xml deleted file mode 100644 index 6715dacb8b..0000000000 --- a/app/src/main/res/drawable/round_grey_stroke.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/search_move_button.xml b/app/src/main/res/drawable/search_move_button.xml deleted file mode 100644 index 767a4c347d..0000000000 --- a/app/src/main/res/drawable/search_move_button.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_border_subject_list.xml b/app/src/main/res/drawable/selector_border_subject_list.xml deleted file mode 100644 index b620ef79a1..0000000000 --- a/app/src/main/res/drawable/selector_border_subject_list.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_gray_border_button.xml b/app/src/main/res/drawable/selector_gray_border_button.xml deleted file mode 100644 index c330cb85c8..0000000000 --- a/app/src/main/res/drawable/selector_gray_border_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_gray_light_button.xml b/app/src/main/res/drawable/selector_gray_light_button.xml deleted file mode 100644 index 01eb647551..0000000000 --- a/app/src/main/res/drawable/selector_gray_light_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_green_gradient_button.xml b/app/src/main/res/drawable/selector_green_gradient_button.xml deleted file mode 100644 index b17a5f58a7..0000000000 --- a/app/src/main/res/drawable/selector_green_gradient_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_ic_news.xml b/app/src/main/res/drawable/selector_ic_news.xml deleted file mode 100644 index 087dc331c8..0000000000 --- a/app/src/main/res/drawable/selector_ic_news.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_menu_collect.xml b/app/src/main/res/drawable/selector_menu_collect.xml deleted file mode 100644 index 5f7a14d576..0000000000 --- a/app/src/main/res/drawable/selector_menu_collect.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_primary_border_button.xml b/app/src/main/res/drawable/selector_primary_border_button.xml deleted file mode 100644 index 24ca61f597..0000000000 --- a/app/src/main/res/drawable/selector_primary_border_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_primary_button.xml b/app/src/main/res/drawable/selector_primary_button.xml deleted file mode 100644 index 2da710cfac..0000000000 --- a/app/src/main/res/drawable/selector_primary_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_primary_light_button.xml b/app/src/main/res/drawable/selector_primary_light_button.xml deleted file mode 100644 index 564b7493e1..0000000000 --- a/app/src/main/res/drawable/selector_primary_light_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_simulator_item.xml b/app/src/main/res/drawable/selector_simulator_item.xml deleted file mode 100644 index 2202af744f..0000000000 --- a/app/src/main/res/drawable/selector_simulator_item.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_video_detail_ad_indicator.xml b/app/src/main/res/drawable/selector_video_detail_ad_indicator.xml index d21809dad4..99d665c975 100644 --- a/app/src/main/res/drawable/selector_video_detail_ad_indicator.xml +++ b/app/src/main/res/drawable/selector_video_detail_ad_indicator.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_yellow_gradient_button.xml b/app/src/main/res/drawable/selector_yellow_gradient_button.xml deleted file mode 100644 index 76a3e298b1..0000000000 --- a/app/src/main/res/drawable/selector_yellow_gradient_button.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/sender_hint_bg.xml b/app/src/main/res/drawable/sender_hint_bg.xml deleted file mode 100644 index 5030795e89..0000000000 --- a/app/src/main/res/drawable/sender_hint_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/servers_calendar_month_selected_background.xml b/app/src/main/res/drawable/servers_calendar_month_selected_background.xml deleted file mode 100644 index e8b377010d..0000000000 --- a/app/src/main/res/drawable/servers_calendar_month_selected_background.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/setting_update_hint.xml b/app/src/main/res/drawable/setting_update_hint.xml deleted file mode 100644 index e85952fd0f..0000000000 --- a/app/src/main/res/drawable/setting_update_hint.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_history_flexbox_divider.xml b/app/src/main/res/drawable/shape_history_flexbox_divider.xml deleted file mode 100644 index 1135937b0e..0000000000 --- a/app/src/main/res/drawable/shape_history_flexbox_divider.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/subject_tab_up.xml b/app/src/main/res/drawable/subject_tab_up.xml deleted file mode 100644 index 34a00eeb74..0000000000 --- a/app/src/main/res/drawable/subject_tab_up.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/suggest_radio_style.xml b/app/src/main/res/drawable/suggest_radio_style.xml deleted file mode 100644 index 0772786052..0000000000 --- a/app/src/main/res/drawable/suggest_radio_style.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/tabbar_center_bg.xml b/app/src/main/res/drawable/tabbar_center_bg.xml deleted file mode 100644 index bf6acba0f9..0000000000 --- a/app/src/main/res/drawable/tabbar_center_bg.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/tabbar_center_selector.xml b/app/src/main/res/drawable/tabbar_center_selector.xml deleted file mode 100644 index 42d1e86c7c..0000000000 --- a/app/src/main/res/drawable/tabbar_center_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/tabbar_left_bg.xml b/app/src/main/res/drawable/tabbar_left_bg.xml deleted file mode 100644 index 46cf6f1c4c..0000000000 --- a/app/src/main/res/drawable/tabbar_left_bg.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/tabbar_left_selector.xml b/app/src/main/res/drawable/tabbar_left_selector.xml deleted file mode 100644 index 5d1fa4a05c..0000000000 --- a/app/src/main/res/drawable/tabbar_left_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/text_blue_background.xml b/app/src/main/res/drawable/text_blue_background.xml deleted file mode 100644 index 359f3cf3d3..0000000000 --- a/app/src/main/res/drawable/text_blue_background.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_border_white_bg.xml b/app/src/main/res/drawable/textview_border_white_bg.xml deleted file mode 100644 index 61fc125a6d..0000000000 --- a/app/src/main/res/drawable/textview_border_white_bg.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_comment_send_style.xml b/app/src/main/res/drawable/textview_comment_send_style.xml deleted file mode 100644 index 95705f7f3d..0000000000 --- a/app/src/main/res/drawable/textview_comment_send_style.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_concern_red_dn_round.xml b/app/src/main/res/drawable/textview_concern_red_dn_round.xml deleted file mode 100644 index 49f00238ba..0000000000 --- a/app/src/main/res/drawable/textview_concern_red_dn_round.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_orange_bg.xml b/app/src/main/res/drawable/textview_orange_bg.xml deleted file mode 100644 index d591552228..0000000000 --- a/app/src/main/res/drawable/textview_orange_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/textview_yellow_bg.xml b/app/src/main/res/drawable/textview_yellow_bg.xml deleted file mode 100644 index 46f0fe8f76..0000000000 --- a/app/src/main/res/drawable/textview_yellow_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/video_upload_post_unavailable.xml b/app/src/main/res/drawable/video_upload_post_unavailable.xml deleted file mode 100644 index f74c59736f..0000000000 --- a/app/src/main/res/drawable/video_upload_post_unavailable.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/video_verify_more_gradient.xml b/app/src/main/res/drawable/video_verify_more_gradient.xml deleted file mode 100644 index 52408fb110..0000000000 --- a/app/src/main/res/drawable/video_verify_more_gradient.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_ask_column_detail.xml b/app/src/main/res/layout/activity_ask_column_detail.xml deleted file mode 100644 index 6cf387e59c..0000000000 --- a/app/src/main/res/layout/activity_ask_column_detail.xml +++ /dev/null @@ -1,139 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_background_clip.xml b/app/src/main/res/layout/activity_background_clip.xml index 56bdc75bde..2ce069b904 100644 --- a/app/src/main/res/layout/activity_background_clip.xml +++ b/app/src/main/res/layout/activity_background_clip.xml @@ -1,61 +1,59 @@ - + - + android:layout_height="match_parent"> - + + - - - - + android:layout_height="68dp" + android:background="@color/black_alpha_60" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - + + + + + - - - - diff --git a/app/src/main/res/layout/activity_help_detail.xml b/app/src/main/res/layout/activity_help_detail.xml index 60f527c9b5..6a187473e8 100644 --- a/app/src/main/res/layout/activity_help_detail.xml +++ b/app/src/main/res/layout/activity_help_detail.xml @@ -1,51 +1,48 @@ - + - + + + android:layout_height="wrap_content"> - - - + android:layout_height="wrap_content" + android:orientation="vertical"> - + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:paddingLeft="20dp" + android:paddingTop="16dp" + android:paddingRight="20dp" + android:paddingBottom="16dp" + android:textColor="@color/text_title" + android:textSize="18sp" + android:textStyle="bold" /> - + - - - - - - + + + diff --git a/app/src/main/res/layout/activity_kaifu_add.xml b/app/src/main/res/layout/activity_kaifu_add.xml index a50f8cb9b4..20a6f708ef 100644 --- a/app/src/main/res/layout/activity_kaifu_add.xml +++ b/app/src/main/res/layout/activity_kaifu_add.xml @@ -1,77 +1,56 @@ + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - + - - - + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/kaifu_add_container" + android:layout_marginTop="20dp" + android:lineSpacingExtra="5dp" + android:text="@string/kaifu_add_hint" + android:textColor="@color/text_subtitle" + android:textSize="12sp" /> + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_kaifu_patch.xml b/app/src/main/res/layout/activity_kaifu_patch.xml index abd607e96c..cf79a861e4 100644 --- a/app/src/main/res/layout/activity_kaifu_patch.xml +++ b/app/src/main/res/layout/activity_kaifu_patch.xml @@ -1,224 +1,211 @@ - + - + - - - - - + android:layout_height="0dp" + android:layout_marginTop="8dp" + android:layout_weight="1" + android:background="@android:color/white" + android:orientation="vertical" + android:padding="20dp"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:background="@color/title" + android:orientation="horizontal" + android:paddingLeft="1dp" + android:paddingTop="1dp" + android:paddingRight="1dp" + android:paddingBottom="1dp"> + android:maxLines="2" + android:textColor="@color/title" + android:textColorHint="@color/title" + android:textSize="11sp" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + diff --git a/app/src/main/res/layout/activity_news_detail.xml b/app/src/main/res/layout/activity_news_detail.xml index a50381f663..006827d293 100644 --- a/app/src/main/res/layout/activity_news_detail.xml +++ b/app/src/main/res/layout/activity_news_detail.xml @@ -48,7 +48,7 @@ android:id="@+id/news_detail_ll_coment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/news_detail_comment" + android:background="@drawable/button_border_gray_oval" android:gravity="center"> - + - + android:layout_height="wrap_content" + android:background="@color/text_28282E" + android:orientation="vertical" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - + + + app:layout_constraintTop_toTopOf="@id/normal_toolbar" /> - - - - - - - - - + - \ No newline at end of file + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_questions_edit.xml b/app/src/main/res/layout/activity_questions_edit.xml index 3236579f15..e71f854aea 100644 --- a/app/src/main/res/layout/activity_questions_edit.xml +++ b/app/src/main/res/layout/activity_questions_edit.xml @@ -1,291 +1,280 @@ - - - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white" + android:focusable="true" + android:focusableInTouchMode="true" + android:orientation="vertical"> + + + + + + + + + + + + + - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + + + + + + + + + android:background="@null" + android:completionThreshold="1" + android:dropDownVerticalOffset="1dp" + android:hint="写下你想问的问题" + android:lineSpacingExtra="8dp" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:popupBackground="@drawable/question_edit_popup_border" + android:textColor="@color/text_title" + android:textColorHint="@color/text_body" + android:textCursorDrawable="@drawable/cursor_color" + android:textSize="16sp" + android:textStyle="bold" /> - + + + + + + + + + + + + + + + + android:layout_height="44dp" + android:layout_above="@+id/editor_insert_container" + android:background="@color/white"> + + + + + + + - - - + android:text="0" + android:textColor="@color/text_body" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="@+id/forum_container" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/forum_container" + app:layout_constraintTop_toTopOf="@+id/forum_container" /> + - - - - - - + android:layout_alignParentBottom="true" /> + android:id="@+id/uploadVideoGuideContainer" + android:layout_width="264dp" + android:layout_height="60dp" + android:layout_marginLeft="8dp" + android:visibility="gone" + tools:visibility="visible"> - - - + android:src="@drawable/pic_upload_video_guide" /> + + + android:id="@+id/originalTipsContainer" + android:layout_width="268dp" + android:layout_height="64dp" + android:layout_alignParentRight="true" + android:layout_marginRight="8dp" + android:visibility="gone" + tools:visibility="visible"> - + android:src="@drawable/pic_original_pop" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="12dp" + android:layout_marginRight="8dp" /> + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_rating_edit.xml b/app/src/main/res/layout/activity_rating_edit.xml index 45c1fcdac0..6e94bdfa8d 100644 --- a/app/src/main/res/layout/activity_rating_edit.xml +++ b/app/src/main/res/layout/activity_rating_edit.xml @@ -1,230 +1,220 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@android:color/white"> - + - - - - + android:layout_below="@+id/toolbar" + android:orientation="vertical"> - + + + + + + + + - + android:layout_height="8dp" + android:background="@color/background" /> - + + + android:text="快来发表您的精彩评分吧" + android:textColor="@color/text_title" + android:textSize="14sp" + android:textStyle="bold" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:text="点击阅读" + android:textColor="@color/hint" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:text="《光环助手评论规则》" + android:textColor="@color/theme_font" /> - - + android:layout_height="7dp" + android:background="@drawable/shadow" + android:visibility="gone" /> - - - - - - - - - - + + + + - - - diff --git a/app/src/main/res/layout/activity_servers_calendar.xml b/app/src/main/res/layout/activity_servers_calendar.xml index 09636f3b08..8249a18f52 100644 --- a/app/src/main/res/layout/activity_servers_calendar.xml +++ b/app/src/main/res/layout/activity_servers_calendar.xml @@ -1,163 +1,160 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> - + + + android:layout_below="@id/normal_toolbar_container" + android:background="@color/white" + android:visibility="gone" + tools:visibility="visible"> - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:background="@color/background" + android:drawableLeft="@drawable/servers_calendar_hint" + android:drawablePadding="4dp" + android:paddingLeft="20dp" + android:paddingTop="12dp" + android:paddingRight="20dp" + android:paddingBottom="12dp" + android:text="开服信息仅供参考，具体请以游戏内开服为准" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_suggest.xml b/app/src/main/res/layout/activity_suggest.xml index e244201b0f..013307107b 100644 --- a/app/src/main/res/layout/activity_suggest.xml +++ b/app/src/main/res/layout/activity_suggest.xml @@ -165,7 +165,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "20dp" android:layout_weight = "1" - android:drawableLeft = "@drawable/suggest_radio_style" + android:drawableLeft = "@drawable/kc_checkbox_style" android:drawablePadding = "10dp" android:gravity = "center" android:paddingTop = "15dp" @@ -180,7 +180,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "20dp" android:layout_weight = "1" - android:drawableLeft = "@drawable/suggest_radio_style" + android:drawableLeft = "@drawable/kc_checkbox_style" android:drawablePadding = "10dp" android:paddingTop = "15dp" android:paddingBottom = "15dp" @@ -194,7 +194,7 @@ android:layout_height = "wrap_content" android:layout_marginLeft = "20dp" android:layout_weight = "1" - android:drawableLeft = "@drawable/suggest_radio_style" + android:drawableLeft = "@drawable/kc_checkbox_style" android:drawablePadding = "10dp" android:paddingTop = "15dp" android:paddingBottom = "15dp" @@ -212,7 +212,7 @@ android:id = "@+id/type_other" android:layout_width = "107dp" android:layout_height = "wrap_content" - android:drawableLeft = "@drawable/suggest_radio_style" + android:drawableLeft = "@drawable/kc_checkbox_style" android:drawablePadding = "10dp" android:paddingLeft = "20dp" android:text = "其他" diff --git a/app/src/main/res/layout/activity_video_game.xml b/app/src/main/res/layout/activity_video_game.xml index 033e980592..4f763c24f8 100644 --- a/app/src/main/res/layout/activity_video_game.xml +++ b/app/src/main/res/layout/activity_video_game.xml @@ -1,172 +1,170 @@ - + - + + + + + + + + + + - + android:gravity="center" + app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> - - - - - - - - - - - + android:background="@drawable/game_video_head_background" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="20dp" + android:paddingTop="8dp" + android:paddingRight="20dp" + android:paddingBottom="16dp" + app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> - - - - - - - - - - - - - - - - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - - + - + + + + + + + android:layout_height="40dp" + android:background="@android:color/white"> + + + + + + + + + + + + - - - diff --git a/app/src/main/res/layout/activity_video_uplaod.xml b/app/src/main/res/layout/activity_video_uplaod.xml index b833d628fc..c87a4d21bb 100644 --- a/app/src/main/res/layout/activity_video_uplaod.xml +++ b/app/src/main/res/layout/activity_video_uplaod.xml @@ -1,567 +1,565 @@ - + - + + + android:layout_height="0dp" + android:layout_weight="1" + android:background="@android:color/white"> - - - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + android:id="@+id/activityFlexbox" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginRight="20dp" + android:paddingBottom="16dp" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@+id/game_tag" + app:layout_constraintTop_toBottomOf="@+id/game_tag" + tools:visibility="visible"> + android:id="@+id/chooseActivityIv" + android:layout_width="wrap_content" + android:layout_height="28dp" + android:background="@drawable/bg_upload_video_choose_activity_enable" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:src="@drawable/ic_upload_video_activity_enable" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_weight="1" + android:drawableLeft="@drawable/ic_activity" + android:drawablePadding="4dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:maxLines="1" + android:textColor="@color/white" + android:textSize="12sp" + tools:text="光遇" /> - + android:src="@drawable/ic_activity_delete" /> + + - + - - - + - + + + + + + + + + + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - + app:layout_constraintTop_toTopOf="@id/watermark_hint" /> - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - + android:layout_height="0dp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="@id/watermark_sb" + app:layout_constraintLeft_toLeftOf="@id/watermark_sb" + app:layout_constraintRight_toRightOf="@id/watermark_sb" + app:layout_constraintTop_toTopOf="@id/watermark_sb" /> - - + - + + + android:id="@+id/update_protocol" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="4dp" + android:layout_marginBottom="2dp" + android:text="@string/upload_protocol" + android:textColor="@color/text_subtitleDesc" + android:textSize="13sp" + app:layout_constraintBottom_toBottomOf="@id/upload_confirm" + app:layout_constraintLeft_toRightOf="@id/upload_confirm" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@id/upload_confirm" /> + + + + + + + + + + + + - - + + diff --git a/app/src/main/res/layout/amway_comment_item.xml b/app/src/main/res/layout/amway_comment_item.xml index 5646032e06..0b7de69f06 100644 --- a/app/src/main/res/layout/amway_comment_item.xml +++ b/app/src/main/res/layout/amway_comment_item.xml @@ -1,240 +1,222 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + app:cardCornerRadius="5dp" + app:cardElevation="0dp"> - + android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@drawable/selector_f8f8f8" + android:paddingLeft="16dp" + android:paddingTop="16dp" + android:paddingRight="16dp" + android:paddingBottom="10dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - + android:layout_marginLeft="12dp" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/text_5D5D5D" + android:textSize="15sp" + android:textStyle="bold" + app:layout_constraintLeft_toRightOf="@id/gameIconView" + app:layout_constraintTop_toTopOf="@id/gameIconView" + tools:text="我的世界（像素村落）如果有很长的文字的话就截断处理" /> - + - + - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - diff --git a/app/src/main/res/layout/amway_search_item.xml b/app/src/main/res/layout/amway_search_item.xml index 1729177ac4..0671b0988e 100644 --- a/app/src/main/res/layout/amway_search_item.xml +++ b/app/src/main/res/layout/amway_search_item.xml @@ -1,61 +1,47 @@ - + - + - - + - + - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/answer_draft_item.xml b/app/src/main/res/layout/answer_draft_item.xml index 5de2986cb9..37397cfa3b 100644 --- a/app/src/main/res/layout/answer_draft_item.xml +++ b/app/src/main/res/layout/answer_draft_item.xml @@ -1,105 +1,88 @@ - + - + - + - - - - - + android:layout_marginTop="14dp" + app:layout_constraintTop_toBottomOf="@id/answer_draft_item_content" + app:viewAspectRatio="2.3" /> - + - + - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/article_detail_fourm_tag_item.xml b/app/src/main/res/layout/article_detail_fourm_tag_item.xml deleted file mode 100644 index c944cc99c0..0000000000 --- a/app/src/main/res/layout/article_detail_fourm_tag_item.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/ask_column_tag_item.xml b/app/src/main/res/layout/ask_column_tag_item.xml deleted file mode 100644 index d17f77596e..0000000000 --- a/app/src/main/res/layout/ask_column_tag_item.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/ask_recommends_concern_list_item.xml b/app/src/main/res/layout/ask_recommends_concern_list_item.xml index 7553ce014d..0519563084 100644 --- a/app/src/main/res/layout/ask_recommends_concern_list_item.xml +++ b/app/src/main/res/layout/ask_recommends_concern_list_item.xml @@ -1,73 +1,60 @@ - + - + - - + - + - + - + - + - - - - - - - - + diff --git a/app/src/main/res/layout/ask_recommends_item_concern.xml b/app/src/main/res/layout/ask_recommends_item_concern.xml index a1d1a17cdc..d2376ecde3 100644 --- a/app/src/main/res/layout/ask_recommends_item_concern.xml +++ b/app/src/main/res/layout/ask_recommends_item_concern.xml @@ -1,41 +1,39 @@ - + - + - + - + - + - - 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 fc568ca30b..469f9f324e 100644 --- a/app/src/main/res/layout/ask_search_question_item.xml +++ b/app/src/main/res/layout/ask_search_question_item.xml @@ -1,50 +1,47 @@ - + - + + + android:layout_marginTop="1dp" + android:includeFontPadding="false" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/black" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/questions_answer_count" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/ask_subject_top_item.xml b/app/src/main/res/layout/ask_subject_top_item.xml deleted file mode 100644 index 69986f5341..0000000000 --- a/app/src/main/res/layout/ask_subject_top_item.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/avatar_background_item.xml b/app/src/main/res/layout/avatar_background_item.xml index 431e762c58..2d626e9477 100644 --- a/app/src/main/res/layout/avatar_background_item.xml +++ b/app/src/main/res/layout/avatar_background_item.xml @@ -1,58 +1,56 @@ - + - + - + - + - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/avatar_item.xml b/app/src/main/res/layout/avatar_item.xml index f78421def4..9bbf7903b6 100644 --- a/app/src/main/res/layout/avatar_item.xml +++ b/app/src/main/res/layout/avatar_item.xml @@ -1,90 +1,88 @@ - + - + - + + + android:maxLines="1" + android:textColor="@color/text_subtitle" + android:textSize="13sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@+id/imageSdv" + app:layout_constraintStart_toStartOf="@+id/imageSdv" + app:layout_constraintTop_toBottomOf="@+id/imageSdv" /> - - - - - - - - - - + android:layout_marginTop="4dp" + android:gravity="center" + android:maxLines="1" + android:textColor="@color/text_subtitleDesc" + android:textSize="13sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@+id/imageSdv" + app:layout_constraintStart_toStartOf="@+id/imageSdv" + app:layout_constraintTop_toBottomOf="@+id/nameTv" /> + - - - \ 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 9abc0d42bf..cd2b2201ff 100644 --- a/app/src/main/res/layout/catalog_header_item.xml +++ b/app/src/main/res/layout/catalog_header_item.xml @@ -1,53 +1,41 @@ - + - - - - - - - - + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="@dimen/home_item_padding" + android:paddingRight="@dimen/home_item_padding"> - + android:includeFontPadding="false" + android:textColor="@color/text_title" + android:textSize="14sp" + android:textStyle="bold" + tools:text="人气手游风向标" /> - + - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/catalog_image_item.xml b/app/src/main/res/layout/catalog_image_item.xml index 92bfd29ce2..18b2c5a6ec 100644 --- a/app/src/main/res/layout/catalog_image_item.xml +++ b/app/src/main/res/layout/catalog_image_item.xml @@ -1,39 +1,31 @@ - - - - - + + + android:layout_height="140dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_marginRight="16dp" + app:fadeDuration="500" + app:placeholderImage="@drawable/occupy" + app:placeholderImageScaleType="fitXY" + app:roundedCornerRadius="8dp" /> - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/catalog_item.xml b/app/src/main/res/layout/catalog_item.xml index 11bad46e5b..5e832bdcf6 100644 --- a/app/src/main/res/layout/catalog_item.xml +++ b/app/src/main/res/layout/catalog_item.xml @@ -1,46 +1,34 @@ - + - - - + - + - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/catalog_subject_collection_item.xml b/app/src/main/res/layout/catalog_subject_collection_item.xml index 2cfeff5c6e..1563b1c14d 100644 --- a/app/src/main/res/layout/catalog_subject_collection_item.xml +++ b/app/src/main/res/layout/catalog_subject_collection_item.xml @@ -1,10 +1,6 @@ - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/catalog_subject_game_item.xml b/app/src/main/res/layout/catalog_subject_game_item.xml index 241a634979..4402d4f9c1 100644 --- a/app/src/main/res/layout/catalog_subject_game_item.xml +++ b/app/src/main/res/layout/catalog_subject_game_item.xml @@ -1,43 +1,30 @@ - + - + - - - - - - - - - - \ No newline at end of file + android:layout_marginLeft="8dp" + android:layout_marginTop="8dp" + android:layout_marginRight="8dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:marqueeRepeatLimit="marquee_forever" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="12sp" + tools:text="超杀默示录" /> + diff --git a/app/src/main/res/layout/category_game_item.xml b/app/src/main/res/layout/category_game_item.xml index 0725e96a33..41e6a4a305 100644 --- a/app/src/main/res/layout/category_game_item.xml +++ b/app/src/main/res/layout/category_game_item.xml @@ -1,313 +1,274 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/reuse_listview_item_style" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="@dimen/home_item_padding"> - + - + - + - + - + - - - - - - + + app:layout_constraintBottom_toTopOf="@+id/label_list" + app:layout_constraintLeft_toRightOf="@+id/gameIconView" + app:layout_constraintRight_toLeftOf="@+id/download_btn" + app:layout_constraintTop_toBottomOf="@+id/game_name"> - - - - - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/game_des" + app:layout_constraintTop_toTopOf="parent" /> - - - - + android:layout_marginTop="5dp" + android:layout_toRightOf="@id/game_rating" + android:ellipsize="end" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_subtitleDesc" + android:textSize="10sp" + app:layout_constraintLeft_toRightOf="@+id/game_rating" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="巫妖王再怒霜之哀殤又飢渴" /> + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + app:layout_goneMarginStart="4dp" + tools:text="最新活动火爆来袭" /> - - - - + + + + + diff --git a/app/src/main/res/layout/category_v2_item.xml b/app/src/main/res/layout/category_v2_item.xml index 76c256dda7..a623b56c00 100644 --- a/app/src/main/res/layout/category_v2_item.xml +++ b/app/src/main/res/layout/category_v2_item.xml @@ -1,46 +1,34 @@ - + - - - + - + - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/collection_comunity_article_item.xml b/app/src/main/res/layout/collection_comunity_article_item.xml index 27272238cf..7559b46555 100644 --- a/app/src/main/res/layout/collection_comunity_article_item.xml +++ b/app/src/main/res/layout/collection_comunity_article_item.xml @@ -1,193 +1,170 @@ - + xmlns:fresco="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/reuse_listview_item_style" + android:paddingLeft="16dp" + android:paddingTop="13dp" + android:paddingRight="16dp" + android:paddingBottom="16dp"> - - - - - - - - + android:ellipsize="end" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - - - - - - - + - - - - - - - - + app:roundingBorderColor="@color/black_alpha_10" + app:roundingBorderWidth="0.5dp" + fresco:roundAsCircle="true" /> - + - + - - + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/comment_item.xml b/app/src/main/res/layout/comment_item.xml index cedd78a590..7be225a973 100644 --- a/app/src/main/res/layout/comment_item.xml +++ b/app/src/main/res/layout/comment_item.xml @@ -72,7 +72,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="4dp" - android:background="@drawable/button_round_2496ff" + android:background="@drawable/button_blue_oval" android:includeFontPadding="false" android:paddingLeft="4dp" android:paddingTop="2dp" diff --git a/app/src/main/res/layout/commodity_item.xml b/app/src/main/res/layout/commodity_item.xml index 622bf4cc3a..679007dcae 100644 --- a/app/src/main/res/layout/commodity_item.xml +++ b/app/src/main/res/layout/commodity_item.xml @@ -1,175 +1,163 @@ - - - - - + - + + + + + + + + android:ellipsize="end" + android:includeFontPadding="false" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textColor="@color/text_title" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/coverImage" + tools:text="犬夜叉经典阿离同款抱枕卡通动漫人物犬夜叉经典阿离同款抱枕卡通动漫人物" /> - + - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:textColor="#FFA142" + android:textSize="10sp" + tools:text="23:59:58 后开抢" /> + + + \ No newline at end of file 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 56b66a783a..4fbc2b97a3 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 @@ -1,71 +1,57 @@ - + - + - - - - - - + android:layout_height="40dp" + android:background="@drawable/common_collection_item_title_bg" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - + - - - - - - - - \ No newline at end of file + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/white" + android:textSize="14sp" + tools:text="8月游戏热点回顾下载" /> + + \ No newline at end of file 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 b6f1e62cf1..92b27ffbce 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 @@ -1,83 +1,68 @@ - + - + - - - - - - + android:layout_height="64dp" + android:background="@drawable/common_collection_item_title_bg" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - + - - - + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/white" + android:textSize="14sp" + tools:text="8月游戏热点回顾下载" /> - - - - - - \ No newline at end of file + + + \ No newline at end of file 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 a57f62f055..8bd9cf2d33 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 @@ -1,81 +1,67 @@ - + - + - - + - + - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/common_collection_item.xml b/app/src/main/res/layout/common_collection_item.xml index 169701845a..9c697f91ef 100644 --- a/app/src/main/res/layout/common_collection_item.xml +++ b/app/src/main/res/layout/common_collection_item.xml @@ -1,137 +1,109 @@ - + - - - - - - - - - - + + + + + + + + + + + + + + + android:layout_marginTop="8dp" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/black" + android:textSize="14sp" + android:visibility="gone" /> - + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/community_answer_item.xml b/app/src/main/res/layout/community_answer_item.xml index 0494f4584e..b041e9996b 100644 --- a/app/src/main/res/layout/community_answer_item.xml +++ b/app/src/main/res/layout/community_answer_item.xml @@ -1,436 +1,402 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/white" + android:orientation="horizontal"> - + - - - - - - - - - - + android:background="@color/white"> + android:paddingLeft="11dp" + android:paddingRight="20dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + android:layout_marginLeft="8dp" + android:layout_marginTop="16dp" + android:paddingLeft="12dp" + android:paddingTop="8dp" + android:paddingRight="12dp" + android:paddingBottom="12dp" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/image_container" + tools:visibility="visible"> + android:id="@+id/popularAnswerUserIcon" + style="@style/frescoCircleStyle" + android:layout_width="20dp" + android:layout_height="20dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:roundingBorderColor="@color/black_alpha_10" + app:roundingBorderWidth="0.5dp" /> + android:layout_marginLeft="8dp" + android:includeFontPadding="false" + android:textColor="@color/theme_font" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="@+id/popularAnswerUserIcon" + app:layout_constraintStart_toEndOf="@+id/popularAnswerUserIcon" + app:layout_constraintTop_toTopOf="@+id/popularAnswerUserIcon" + tools:text="原神大佬" /> + app:layout_constraintBottom_toBottomOf="@+id/popularAnswerUserName" + app:layout_constraintStart_toEndOf="@+id/popularAnswerUserName" + app:layout_constraintTop_toTopOf="@+id/popularAnswerUserName" /> + + + + + + + + + + android:layout_height="24dp" + android:layout_marginLeft="20dp" + android:background="@drawable/bg_shape_f5_radius_999" + android:gravity="center_vertical" + android:orientation="horizontal"> + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:textSize="11sp" + tools:text="地下城与勇士" /> - - - - - - - - - - - - - - - - - + - - - - - + + + + + diff --git a/app/src/main/res/layout/community_article_draft_item.xml b/app/src/main/res/layout/community_article_draft_item.xml index c794fd9516..4e495dc4db 100644 --- a/app/src/main/res/layout/community_article_draft_item.xml +++ b/app/src/main/res/layout/community_article_draft_item.xml @@ -1,76 +1,62 @@ - + - - - - - - - - + android:ellipsize="end" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/community_follow_item.xml b/app/src/main/res/layout/community_follow_item.xml deleted file mode 100644 index 290f71dc66..0000000000 --- a/app/src/main/res/layout/community_follow_item.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/community_my_answer_item.xml b/app/src/main/res/layout/community_my_answer_item.xml index 90c91bfd74..7c2a277b95 100644 --- a/app/src/main/res/layout/community_my_answer_item.xml +++ b/app/src/main/res/layout/community_my_answer_item.xml @@ -1,162 +1,148 @@ - + - - - - - - - - + android:ellipsize="end" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + android:visibility="visible" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@id/vote_count_container" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - + android:minEms="3" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + tools:text="16" /> - + - + - + - - - + android:layout_centerInParent="true" + android:src="@drawable/community_vote_selector" /> - - + - + + + + - + + + + diff --git a/app/src/main/res/layout/community_question_draft_item.xml b/app/src/main/res/layout/community_question_draft_item.xml index b3fac2db35..082266f702 100644 --- a/app/src/main/res/layout/community_question_draft_item.xml +++ b/app/src/main/res/layout/community_question_draft_item.xml @@ -1,77 +1,63 @@ - + - - - - - - - - + android:ellipsize="end" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/community_question_item.xml b/app/src/main/res/layout/community_question_item.xml index c306bad7ce..109d3906ec 100644 --- a/app/src/main/res/layout/community_question_item.xml +++ b/app/src/main/res/layout/community_question_item.xml @@ -1,80 +1,78 @@ - + - + android:layout_marginLeft="20dp" + android:layout_marginTop="16dp" + android:layout_marginRight="20dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="其实我想躲於你附近，其实我想赌赌我命运，然后你承认我我是谁的候任" /> + + + + - - + android:minEms="2" + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + tools:text="16" /> - + - - - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/community_search_columm_item.xml b/app/src/main/res/layout/community_search_columm_item.xml index a1187e935b..9aa7c2e7fd 100644 --- a/app/src/main/res/layout/community_search_columm_item.xml +++ b/app/src/main/res/layout/community_search_columm_item.xml @@ -1,101 +1,87 @@ - + - - - - - - - + android:drawableLeft="@drawable/search_column_icon" + android:drawablePadding="6dp" + android:gravity="center_vertical" + android:includeFontPadding="false" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:text="专题" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - - + - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/community_search_history_item.xml b/app/src/main/res/layout/community_search_history_item.xml deleted file mode 100644 index 6574d14dc9..0000000000 --- a/app/src/main/res/layout/community_search_history_item.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/community_search_hot_item.xml b/app/src/main/res/layout/community_search_hot_item.xml deleted file mode 100644 index 34a7a2421b..0000000000 --- a/app/src/main/res/layout/community_search_hot_item.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/community_search_special_columm_item.xml b/app/src/main/res/layout/community_search_special_columm_item.xml index 0ee956f824..f11eeef598 100644 --- a/app/src/main/res/layout/community_search_special_columm_item.xml +++ b/app/src/main/res/layout/community_search_special_columm_item.xml @@ -1,97 +1,83 @@ - + - - - - - - - + android:drawableLeft="@drawable/search_special_column_icon" + android:drawablePadding="6dp" + android:gravity="center_vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:text="专栏" + android:textColor="@color/text_3a3a3a" + android:textSize="14sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - + - + - + - + - - + diff --git a/app/src/main/res/layout/community_select_opened_head_item.xml b/app/src/main/res/layout/community_select_opened_head_item.xml index 7213fd6271..e0c1de271b 100644 --- a/app/src/main/res/layout/community_select_opened_head_item.xml +++ b/app/src/main/res/layout/community_select_opened_head_item.xml @@ -1,36 +1,26 @@ - + - - - - - - + android:layout_marginTop="8dp" + android:background="@color/white" + android:gravity="center_vertical" + android:includeFontPadding="false" + android:orientation="horizontal" + android:paddingLeft="20dp" + android:paddingTop="16dp" + android:paddingBottom="4dp" + android:text="@{categoryName}" + android:textColor="@color/text_subtitle" + android:textSize="14sp" + android:textStyle="bold" + tools:text="我的游戏" /> - - - - \ No newline at end of file + \ No newline at end of file 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 81b42f4c03..ea94a5eea8 100644 --- a/app/src/main/res/layout/community_select_opened_item.xml +++ b/app/src/main/res/layout/community_select_opened_item.xml @@ -1,136 +1,111 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@android:color/white" + android:orientation="horizontal" + android:paddingTop="12dp" + android:paddingBottom="12dp"> - + - + - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="10dp" + android:ellipsize="end" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@+id/community_status_left" + app:layout_constraintLeft_toRightOf="@id/game_icon_left" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@id/game_icon_left" + tools:text="UC浏览器（无广告" /> - + - + - + - + - + android:layout_height="wrap_content" + android:layout_marginLeft="15dp" + android:layout_marginRight="15dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@+id/community_status_right" + app:layout_constraintLeft_toRightOf="@id/game_icon_right" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="@id/game_icon_right" + tools:text="UC浏览器（无广告" /> - + - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/community_video_draft_item.xml b/app/src/main/res/layout/community_video_draft_item.xml index 2b31249c56..957cab7415 100644 --- a/app/src/main/res/layout/community_video_draft_item.xml +++ b/app/src/main/res/layout/community_video_draft_item.xml @@ -1,76 +1,62 @@ - + - - - - - - - - + android:ellipsize="end" + android:lineSpacingExtra="6dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/daily_task_item.xml b/app/src/main/res/layout/daily_task_item.xml index f4b897d738..01feafcf4d 100644 --- a/app/src/main/res/layout/daily_task_item.xml +++ b/app/src/main/res/layout/daily_task_item.xml @@ -1,97 +1,84 @@ - + - - - - - + android:layout_height="56dp" + android:layout_marginLeft="8dp" + android:layout_marginTop="12dp" + android:layout_marginRight="8dp" + android:background="@drawable/background_shape_white_radius_5"> - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml index 174fee84d4..e3b3bfe909 100644 --- a/app/src/main/res/layout/dialog_disallow_privacy_policy.xml +++ b/app/src/main/res/layout/dialog_disallow_privacy_policy.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="20dp" - android:background="@drawable/dialog_privacy_background" + android:background="@drawable/dialog_reserve_background" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" diff --git a/app/src/main/res/layout/dialog_download.xml b/app/src/main/res/layout/dialog_download.xml index ef36c7f272..a50518009f 100644 --- a/app/src/main/res/layout/dialog_download.xml +++ b/app/src/main/res/layout/dialog_download.xml @@ -1,137 +1,134 @@ - + android:layout_width="match_parent" + android:layout_height="match_parent"> - + android:layout_height="400dp" + android:layout_gravity="bottom" + android:background="@drawable/download_dialog_background" + android:descendantFocusability="blocksDescendants"> - + + + android:layout_height="64dp" + android:clickable="false" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - - - - - - - - - - - - - - - - + + android:paddingRight="12dp" /> - - - + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_download_link.xml b/app/src/main/res/layout/dialog_download_link.xml index 627a643e5e..df08d6816c 100644 --- a/app/src/main/res/layout/dialog_download_link.xml +++ b/app/src/main/res/layout/dialog_download_link.xml @@ -1,53 +1,50 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/download_link_dialog_background" + android:orientation="vertical" + android:padding="24dp" + app:maxHeight="400dp" + tools:ignore="WebViewLayout"> - + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - - - - + diff --git a/app/src/main/res/layout/dialog_installed_game.xml b/app/src/main/res/layout/dialog_installed_game.xml index 94bbb2492e..edd58525c9 100644 --- a/app/src/main/res/layout/dialog_installed_game.xml +++ b/app/src/main/res/layout/dialog_installed_game.xml @@ -52,7 +52,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="25dp" android:layout_weight="1" - android:background="@drawable/button_round_2496ff" + android:background="@drawable/button_blue_oval" android:gravity="center" android:text="确定" android:textStyle="bold" diff --git a/app/src/main/res/layout/dialog_oversea_confirmation.xml b/app/src/main/res/layout/dialog_oversea_confirmation.xml index 40f974f91e..6eb37f40d2 100644 --- a/app/src/main/res/layout/dialog_oversea_confirmation.xml +++ b/app/src/main/res/layout/dialog_oversea_confirmation.xml @@ -1,93 +1,82 @@ - + - + - - + - - - - - - - - - - - - - - - - + android:layout_gravity="center" + android:layout_marginTop="14dp" + android:includeFontPadding="false" + android:textColor="@color/text_title" + android:textSize="13sp" + android:textStyle="bold" + tools:text="光环助手" /> - - \ No newline at end of file + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_progress.xml b/app/src/main/res/layout/dialog_progress.xml index c6a241a44b..ef52444fb7 100644 --- a/app/src/main/res/layout/dialog_progress.xml +++ b/app/src/main/res/layout/dialog_progress.xml @@ -1,29 +1,28 @@ + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp"> diff --git a/app/src/main/res/layout/dialog_reserve.xml b/app/src/main/res/layout/dialog_reserve.xml index 51b5957c79..fcaad15230 100644 --- a/app/src/main/res/layout/dialog_reserve.xml +++ b/app/src/main/res/layout/dialog_reserve.xml @@ -1,43 +1,40 @@ - + - + android:src="@drawable/dialog_reserve_head_background" /> - + - + - + - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/dialog_reserve_item.xml b/app/src/main/res/layout/dialog_reserve_item.xml index e82e1525cc..5613bb9025 100644 --- a/app/src/main/res/layout/dialog_reserve_item.xml +++ b/app/src/main/res/layout/dialog_reserve_item.xml @@ -1,43 +1,32 @@ - + xmlns:fresco="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp"> - + - - - - - - - - - - \ No newline at end of file + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="12sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/icon" /> + diff --git a/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml b/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml index 27809221aa..1eb21edd35 100644 --- a/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml +++ b/app/src/main/res/layout/dialog_servers_calendear_detail_item.xml @@ -1,55 +1,52 @@ - + - + android:layout_weight="1" + android:paddingLeft="24dp" + android:text="时间" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" /> - + - + - + - - - - + diff --git a/app/src/main/res/layout/dialog_upload_schedule.xml b/app/src/main/res/layout/dialog_upload_schedule.xml index 0383c9eef4..9e137e32e4 100644 --- a/app/src/main/res/layout/dialog_upload_schedule.xml +++ b/app/src/main/res/layout/dialog_upload_schedule.xml @@ -1,96 +1,88 @@ - + - - - - + + + + + + + android:layout_marginTop="32dp" + android:layout_marginBottom="24dp" + android:gravity="center" + android:orientation="horizontal"> - + android:textSize="14sp" /> - + - - - - - + + - - \ No newline at end of file + 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 0934049318..81a02c266e 100644 --- a/app/src/main/res/layout/download_dialog_installed_item.xml +++ b/app/src/main/res/layout/download_dialog_installed_item.xml @@ -1,219 +1,200 @@ - + - - - - - - - - + + + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" + fresco:placeholderImage="@drawable/download_dialog_game_icon_placeholder" + fresco:placeholderImageScaleType="fitXY" + fresco:roundedCornerRadius="4dp" + fresco:roundingBorderColor="@color/black_alpha_10" + fresco:roundingBorderWidth="0.5dp" /> - + - + + + + + + + - - - - - - + android:layout_marginRight="12dp" + android:drawableLeft="@drawable/download_dialog_status_launch" + android:drawablePadding="4dp" + android:textColor="@color/theme" + android:textSize="12sp" + android:visibility="gone" /> - + - + - + - + - + - + - + - + + - - - - - diff --git a/app/src/main/res/layout/download_dialog_instruction_item.xml b/app/src/main/res/layout/download_dialog_instruction_item.xml index fdd16de6b0..76315e9b6f 100644 --- a/app/src/main/res/layout/download_dialog_instruction_item.xml +++ b/app/src/main/res/layout/download_dialog_instruction_item.xml @@ -1,25 +1,23 @@ - + - + android:scrollbars="none" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - + diff --git a/app/src/main/res/layout/download_dialog_item.xml b/app/src/main/res/layout/download_dialog_item.xml index 79fc53f834..f15a25378c 100644 --- a/app/src/main/res/layout/download_dialog_item.xml +++ b/app/src/main/res/layout/download_dialog_item.xml @@ -1,203 +1,182 @@ - - + - - - - - - + android:background="@drawable/download_dialog_item_background" + android:orientation="vertical"> - + + + + + android:layout_marginLeft="8dp" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="12sp" + app:layout_constraintBottom_toTopOf="@id/remark" + app:layout_constraintLeft_toRightOf="@id/icon" + app:layout_constraintRight_toLeftOf="@id/download_status_icon" + app:layout_constraintTop_toTopOf="@id/icon" + app:layout_constraintVertical_chainStyle="packed" + tools:text="九游版" /> + - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:layout_marginTop="2dp" + android:drawablePadding="2dp" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/theme_font" + android:textSize="10sp" + app:layout_constraintBottom_toBottomOf="@id/icon" + app:layout_constraintLeft_toRightOf="@id/icon" + app:layout_constraintTop_toBottomOf="@id/remark" + tools:text="点击启动" /> - + + + + + + android:background="@drawable/download_dialog_item_install_background" + android:gravity="center" + android:text="安装" + android:textColor="@color/white" + android:textSize="14sp" /> + + + + + + + + + + + + + - - - - diff --git a/app/src/main/res/layout/download_dialog_link_item.xml b/app/src/main/res/layout/download_dialog_link_item.xml index c9b1aac529..0c07809f3d 100644 --- a/app/src/main/res/layout/download_dialog_link_item.xml +++ b/app/src/main/res/layout/download_dialog_link_item.xml @@ -1,71 +1,41 @@ - + - + - + - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/download_dialog_platform_request_item.xml b/app/src/main/res/layout/download_dialog_platform_request_item.xml index fc41363334..3ebdf93579 100644 --- a/app/src/main/res/layout/download_dialog_platform_request_item.xml +++ b/app/src/main/res/layout/download_dialog_platform_request_item.xml @@ -1,29 +1,27 @@ - + - + android:gravity="center" + android:paddingTop="12dp" + android:paddingBottom="12dp" + android:text="没有我的版本？求版本 >" + android:textColor="@color/theme_font" + android:textSize="12sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - diff --git a/app/src/main/res/layout/download_dialog_section_item.xml b/app/src/main/res/layout/download_dialog_section_item.xml index 53e3bc4f81..5452952761 100644 --- a/app/src/main/res/layout/download_dialog_section_item.xml +++ b/app/src/main/res/layout/download_dialog_section_item.xml @@ -1,49 +1,35 @@ - + - + - + - - - - - - - - - - - + diff --git a/app/src/main/res/layout/editor_insert_container.xml b/app/src/main/res/layout/editor_insert_container.xml index f6bddb7b82..6f0da6899e 100644 --- a/app/src/main/res/layout/editor_insert_container.xml +++ b/app/src/main/res/layout/editor_insert_container.xml @@ -1,348 +1,346 @@ - + - + android:background="@color/white" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - + - + - + - + - + + - - + - + + - + + + + + + + + + + + + + + + + + + + + + + + + android:id="@+id/editor_link_answer" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:orientation="vertical" + app:layout_constraintEnd_toStartOf="@+id/editor_link_article" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + android:src="@drawable/icon_editor_link_answer" /> - - - - - + + android:id="@+id/editor_link_article" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:orientation="vertical" + app:layout_constraintEnd_toStartOf="@+id/editor_link_video" + app:layout_constraintStart_toEndOf="@+id/editor_link_answer" + app:layout_constraintTop_toTopOf="parent"> - + android:src="@drawable/icon_editor_link_article" /> - - - - - - - + - + + + + + + + + + + + + + + + android:gravity="center_horizontal" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="@+id/editor_link_answer" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/editor_link_answer"> - + + + android:layout_marginTop="8dp" + android:gravity="center" + android:text="引用游戏单" + android:textColor="@color/text_subtitle" + android:textSize="11sp" /> + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - \ No newline at end of file + diff --git a/app/src/main/res/layout/editor_insert_default_item.xml b/app/src/main/res/layout/editor_insert_default_item.xml index c2763ffe23..f90b4bad7b 100644 --- a/app/src/main/res/layout/editor_insert_default_item.xml +++ b/app/src/main/res/layout/editor_insert_default_item.xml @@ -1,70 +1,58 @@ - + - + - - + - + + + android:layout_height="1dp" + android:layout_marginLeft="20dp" + android:layout_marginRight="20dp" + android:background="@color/divider" + app:layout_constraintBottom_toBottomOf="parent" /> - - - - - - - - - - - + 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 c9742cff98..6652abd54b 100644 --- a/app/src/main/res/layout/followers_or_fans_item.xml +++ b/app/src/main/res/layout/followers_or_fans_item.xml @@ -1,142 +1,122 @@ - + - - - - - - - - - - - - - - - - - + android:layout_marginLeft="8dp" + android:layout_marginTop="12dp" + android:layout_marginBottom="20dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toRightOf="@id/user_icon" + app:layout_constraintTop_toBottomOf="@id/user_introduce"> + tools:text="1回答" /> + android:layout_toRightOf="@id/answer_count" + android:textColor="@color/text_subtitle" + android:textSize="11sp" + tools:text="1赞同" /> + - + - + + + + + - + - + + + - - diff --git a/app/src/main/res/layout/forum_activity_item.xml b/app/src/main/res/layout/forum_activity_item.xml index 9a9ef223fb..427a183e05 100644 --- a/app/src/main/res/layout/forum_activity_item.xml +++ b/app/src/main/res/layout/forum_activity_item.xml @@ -1,85 +1,74 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="16dp"> - + - - + - + android:layout_marginTop="12dp" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/introPic" + tools:text="官方预告，5.20限时领福利礼好礼等你拿快来参加吧还有更多好礼等你拿" /> - + - + + - - - - - - - diff --git a/app/src/main/res/layout/forum_item.xml b/app/src/main/res/layout/forum_item.xml index 423d25a278..f3646cf94a 100644 --- a/app/src/main/res/layout/forum_item.xml +++ b/app/src/main/res/layout/forum_item.xml @@ -1,51 +1,36 @@ - + - - + - - - - + android:layout_marginLeft="12dp" + android:layout_marginRight="20dp" + android:layout_weight="1" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="14sp" /> - - - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/forum_my_follow.xml b/app/src/main/res/layout/forum_my_follow.xml index 40cb394792..92d4a3c0a5 100644 --- a/app/src/main/res/layout/forum_my_follow.xml +++ b/app/src/main/res/layout/forum_my_follow.xml @@ -1,71 +1,59 @@ - + - - - - + + android:layout_height="80dp" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp"> - + - + - + - - - - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/forum_record_item.xml b/app/src/main/res/layout/forum_record_item.xml index b8103899ca..44ce22045c 100644 --- a/app/src/main/res/layout/forum_record_item.xml +++ b/app/src/main/res/layout/forum_record_item.xml @@ -1,51 +1,43 @@ - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="52dp" + android:layout_height="wrap_content" + android:layout_marginRight="12dp" + android:gravity="center_horizontal" + android:orientation="vertical"> - + + + android:layout_marginTop="4dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="11sp" + app:layout_constraintLeft_toLeftOf="@+id/forumIv" + app:layout_constraintRight_toRightOf="@+id/forumIv" + app:layout_constraintTop_toBottomOf="@+id/forumIv" + tools:text="龙之谷" /> - - - - - - - \ No newline at end of file + + \ No newline at end of file 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 2f0a8c1d0e..60caa9d8ee 100644 --- a/app/src/main/res/layout/forum_search_content_list.xml +++ b/app/src/main/res/layout/forum_search_content_list.xml @@ -1,143 +1,128 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - + - - - - - - + android:layout_height="wrap_content" + android:background="@color/white" + android:orientation="vertical" + android:paddingLeft="20dp" + android:paddingTop="16dp" + android:paddingRight="20dp"> - + - + + + + + + + + + + + + + android:layout_marginTop="12dp" + android:layout_marginBottom="16dp"> - - - - - - - - - - - - - - - + android:textColor="@color/text_subtitleDesc" + android:textSize="11sp" /> - + + - - - - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/forum_top_link_item.xml b/app/src/main/res/layout/forum_top_link_item.xml index 8bdad6c861..b4333ae434 100644 --- a/app/src/main/res/layout/forum_top_link_item.xml +++ b/app/src/main/res/layout/forum_top_link_item.xml @@ -1,37 +1,35 @@ - + - + - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/forum_welfare_item.xml b/app/src/main/res/layout/forum_welfare_item.xml index 220b0ec11f..292042f1e7 100644 --- a/app/src/main/res/layout/forum_welfare_item.xml +++ b/app/src/main/res/layout/forum_welfare_item.xml @@ -1,36 +1,33 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp"> - + + - - - - - - \ No newline at end of file + android:layout_marginLeft="12dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@+id/welfareIv" + app:layout_constraintLeft_toRightOf="@+id/welfareIv" + app:layout_constraintTop_toTopOf="@+id/welfareIv" + tools:text="龙之谷" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_amway_search_default.xml b/app/src/main/res/layout/fragment_amway_search_default.xml index 5a21c27ce3..c68381a873 100644 --- a/app/src/main/res/layout/fragment_amway_search_default.xml +++ b/app/src/main/res/layout/fragment_amway_search_default.xml @@ -1,37 +1,33 @@ - + - + + + android:layout_height="match_parent" + android:layout_gravity="center" + android:background="@color/background" + android:gravity="center" + android:orientation="vertical" + android:visibility="gone" + tools:visibility="visible"> - - - + android:text="搜索游戏，发表评论" + android:textColor="@color/c7c7c7" + android:textSize="15sp" /> - + - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_amway_success.xml b/app/src/main/res/layout/fragment_amway_success.xml index 14d9a02266..771d18c5e3 100644 --- a/app/src/main/res/layout/fragment_amway_success.xml +++ b/app/src/main/res/layout/fragment_amway_success.xml @@ -67,7 +67,7 @@ android:layout_width="match_parent" android:layout_height="44dp" android:layout_marginLeft="16dp" - android:background="@drawable/button_round_2496ff" + android:background="@drawable/button_blue_oval" android:gravity="center" android:paddingLeft="26dp" android:paddingRight="26dp" diff --git a/app/src/main/res/layout/fragment_answer_detail.xml b/app/src/main/res/layout/fragment_answer_detail.xml index 98e6b20c82..9326a1e7cc 100644 --- a/app/src/main/res/layout/fragment_answer_detail.xml +++ b/app/src/main/res/layout/fragment_answer_detail.xml @@ -1,307 +1,293 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> - - - - - - - - + android:layout_height="match_parent" + android:background="@android:color/white" + android:visibility="visible"> - + android:layout_height="wrap_content" + android:paddingBottom="90dp"> - + + + android:paddingBottom="10dp" + app:layout_constraintTop_toBottomOf="@id/top_padding_view"> - - - + android:layout_marginLeft="20dp" + android:layout_marginTop="12dp" + android:layout_marginRight="20dp" + android:gravity="center_vertical" + android:lineSpacingExtra="6dp" + android:textColor="@color/black" + android:textSize="16sp" + android:textStyle="bold" /> - + + + + + + + + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="9dp" + android:paddingTop="7dp" + android:paddingRight="9dp" + android:paddingBottom="7dp"> - + - + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:gravity="center_vertical" + android:paddingTop="2dp" + android:paddingRight="20dp" + android:paddingBottom="2dp"> - + android:layout_marginRight="7dp" + android:drawableRight="@drawable/answer_detail_more_answer_icon" + android:drawablePadding="8dp" + android:textColor="@color/text_subtitle" + android:textSize="13sp" + tools:text="查看全部66个回答" /> - - - - - - - - - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + - + - + - + - - + + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_answer_edit.xml b/app/src/main/res/layout/fragment_answer_edit.xml index d1cfa83801..aa54c702d1 100644 --- a/app/src/main/res/layout/fragment_answer_edit.xml +++ b/app/src/main/res/layout/fragment_answer_edit.xml @@ -1,221 +1,220 @@ - + - + + + + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:gravity="center_vertical" + android:includeFontPadding="false" + android:lineSpacingExtra="6dp" + android:paddingLeft="20dp" + android:paddingTop="20dp" + android:paddingRight="10dp" + android:paddingBottom="12dp" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + tools:text="快递公司全面复工:三通一达等均已全网恢复正常运营" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:background="@android:color/white" + android:gravity="center" + app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> + app:layout_scrollFlags="scroll|enterAlwaysCollapsed"> - + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginTop="12dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="8dp" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:textColor="@color/text_subtitle" + android:textSize="14sp" + tools:text="国家邮政局召开部分快递企业专题电话会议。国家邮政局局党组书记、局长马军胜主持召开专题电话会议，向中通、圆通、申通、韵达、百世" /> - + android:layout_height="100dp" + android:layout_marginLeft="20dp" + android:layout_marginTop="8dp" + android:layout_marginRight="20dp" + android:layout_marginBottom="16dp"> - + - + - + + + + + + + + + + + + + + + + + + + + - - + + - + android:orientation="vertical" + app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + - - + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_background_preview.xml b/app/src/main/res/layout/fragment_background_preview.xml index 4a68070e55..f6cbbf0eac 100644 --- a/app/src/main/res/layout/fragment_background_preview.xml +++ b/app/src/main/res/layout/fragment_background_preview.xml @@ -1,229 +1,226 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/white"> - + + + android:orientation="vertical"> - + android:layout_height="wrap_content" /> - + android:layout_height="@dimen/appbar_height"> - - - - - - - - - - - - + android:background="@color/transparent" /> + + + + + + - + - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + tools:background="@color/text_subtitle" /> - - - - - - - - - - - - + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_catalog.xml b/app/src/main/res/layout/fragment_catalog.xml index 7c00db2791..2d56f2253f 100644 --- a/app/src/main/res/layout/fragment_catalog.xml +++ b/app/src/main/res/layout/fragment_catalog.xml @@ -1,47 +1,44 @@ - - + + + android:layout_height="1dp" + android:background="@color/divider" /> - + + + + + android:layout_height="match_parent" /> + - + - + - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_community_home.xml b/app/src/main/res/layout/fragment_community_home.xml index c8fadc21b6..9059e5d776 100644 --- a/app/src/main/res/layout/fragment_community_home.xml +++ b/app/src/main/res/layout/fragment_community_home.xml @@ -31,7 +31,7 @@ android:layout_height="8dp" android:layout_alignParentBottom="true" app:disableIndicatorScaling="true" - app:indicatorDrawable="@drawable/ic_forum_tab_indicator" /> + app:indicatorDrawable="@drawable/ic_commodity_selected" /> - + - - - - - - - - - - - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical" + android:visibility="gone" + tools:visibility="visible"> - + android:gravity="center" + app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> - + app:contentScrim="@color/white" + app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:scrimAnimationDuration="0" + app:scrimVisibleHeightTrigger="80dp" + app:titleEnabled="false"> - + android:gravity="center_horizontal" + android:orientation="vertical" + app:layout_collapseMode="pin"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="match_parent" + android:background="@color/transparent" + android:gravity="center_vertical" + android:orientation="horizontal" + android:translationX="-5dp"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginLeft="8dp" + android:layout_weight="1" + android:ellipsize="end" + android:maxLines="1" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" /> + android:id="@+id/searchIv" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + android:layout_marginLeft="15dp" + android:layout_marginRight="18dp" + android:src="@drawable/ic_forum_detail_search" /> + - + - - - - - - - - + android:layout_height="wrap_content" + android:background="@android:color/white"> - - + - + - + - + - + - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_forum_home.xml b/app/src/main/res/layout/fragment_forum_home.xml index c34c861904..16046ec643 100644 --- a/app/src/main/res/layout/fragment_forum_home.xml +++ b/app/src/main/res/layout/fragment_forum_home.xml @@ -202,7 +202,7 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/column_detail_appbar" /> + app:layout_constraintTop_toBottomOf="@id/appbar" /> diff --git a/app/src/main/res/layout/fragment_forum_video_detail.xml b/app/src/main/res/layout/fragment_forum_video_detail.xml index 64eb77b6ea..43ae734843 100644 --- a/app/src/main/res/layout/fragment_forum_video_detail.xml +++ b/app/src/main/res/layout/fragment_forum_video_detail.xml @@ -1,267 +1,256 @@ - + - - - - - - + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> - + android:gravity="center" + app:elevation="0dp" + app:layout_behavior="com.gh.common.view.FixAppBarLayoutBehavior"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:contentScrim="@color/white" + app:layout_scrollFlags="scroll|exitUntilCollapsed" + app:scrimAnimationDuration="0" + app:scrimVisibleHeightTrigger="105dp" + app:titleEnabled="false"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:layout_height="wrap_content"> - + - + - + + - + + - + android:overScrollMode="never" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - - - - + android:layout_height="8dp" + android:background="@drawable/bg_forum_video_detail_shadow" + app:layout_behavior="@string/appbar_scrolling_view_behavior" /> - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game.xml b/app/src/main/res/layout/fragment_game.xml index f368cee408..dd2cd5e494 100644 --- a/app/src/main/res/layout/fragment_game.xml +++ b/app/src/main/res/layout/fragment_game.xml @@ -1,62 +1,43 @@ + - - - - - - - - - - - - + android:layout_height="match_parent"> - - - - - - - - - - - - + android:background="@color/white" + android:clipToPadding="false" /> - - + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_game_collection_detail.xml b/app/src/main/res/layout/fragment_game_collection_detail.xml index b2ca29b37f..28f8b2cf35 100644 --- a/app/src/main/res/layout/fragment_game_collection_detail.xml +++ b/app/src/main/res/layout/fragment_game_collection_detail.xml @@ -80,7 +80,7 @@ android:layout_width="100dp" android:layout_height="10dp" android:layout_centerVertical="true" - android:progressDrawable="@drawable/progressbar_played_game_style" /> + android:progressDrawable="@drawable/progressbar_played_game_blue_style" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_collection_poster.xml b/app/src/main/res/layout/fragment_game_collection_poster.xml index 3c65a28ce1..132d8ac95b 100644 --- a/app/src/main/res/layout/fragment_game_collection_poster.xml +++ b/app/src/main/res/layout/fragment_game_collection_poster.xml @@ -1,161 +1,146 @@ - + - - - - - - - + android:layout_height="match_parent" + android:scaleType="centerCrop" /> - + + + + + + + + + + + + + + + + + + + - - - - + android:layout_height="2dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:background="@color/white_alpha_10" + app:layout_constraintTop_toBottomOf="@+id/userIcon" /> - - - - - - - - - - - - - - - - - - - \ No newline at end of file + android:lineSpacingExtra="7dp" + android:paddingBottom="8dp" + android:textColor="@color/white" + android:textSize="14sp" + app:layout_constraintTop_toBottomOf="@+id/divider" + tools:text="第一行一二三四五六七八九十一二三四五六七八第一行一二三四五六七八九十一二三四五六七八第一行一二三四五六七八九十一二三四五六七八" /> + + \ No newline at end of file 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 4c56424858..31db5c2f68 100644 --- a/app/src/main/res/layout/fragment_game_collection_square.xml +++ b/app/src/main/res/layout/fragment_game_collection_square.xml @@ -75,10 +75,10 @@ android:id="@+id/tagFilterContainer" android:layout_width="match_parent" android:layout_height="64dp" + android:layout_marginTop="-16dp" android:background="@drawable/bg_game_collection_square" android:paddingStart="16dp" android:paddingEnd="16dp" - android:layout_marginTop="-16dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -114,46 +114,21 @@ - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + app:sfv_itemHeight="24dp" + app:sfv_itemWidth="36dp" + app:sfv_textColor="@color/game_collection_rg_button_selector" + app:sfv_textSize="10" /> + @@ -174,15 +149,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - + android:src="@drawable/community_edit_icon" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml b/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml new file mode 100644 index 0000000000..ffbbaab974 --- /dev/null +++ b/app/src/main/res/layout/fragment_game_collection_square_al_skeleton.xml @@ -0,0 +1,329 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml b/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml new file mode 100644 index 0000000000..ee3144fecb --- /dev/null +++ b/app/src/main/res/layout/fragment_game_collection_square_skeleton.xml @@ -0,0 +1,286 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_help_contaier.xml b/app/src/main/res/layout/fragment_help_contaier.xml index 95cfb13c30..3c7c162873 100644 --- a/app/src/main/res/layout/fragment_help_contaier.xml +++ b/app/src/main/res/layout/fragment_help_contaier.xml @@ -1,110 +1,107 @@ - + - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:layout_height="wrap_content" + android:background="@color/white" + android:focusableInTouchMode="true"> - + - - - - - - - - - - - - - - - + android:background="@null" + android:hint="请输入关键词搜索" + android:imeOptions="actionSearch" + android:paddingLeft="34dp" + android:paddingRight="40dp" + android:singleLine="true" + android:textColorHint="@color/text_body" + android:textCursorDrawable="@drawable/cursor_color" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@id/search_background" + app:layout_constraintLeft_toLeftOf="@id/search_background" + app:layout_constraintRight_toRightOf="@id/search_background" + app:layout_constraintTop_toTopOf="@id/search_background" /> - + - - - + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 29d8282f0c..c41f09308b 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -523,7 +523,7 @@ android:layout_width="wrap_content" android:layout_height="26dp" android:layout_marginRight="16dp" - android:background="@drawable/bg_user_home_normal_btn" + android:background="@drawable/background_shape_round_white_alpha_20" android:gravity="center" android:paddingLeft="12dp" android:paddingRight="12dp" @@ -541,7 +541,7 @@ android:layout_height="24dp" android:layout_marginTop="24dp" android:layout_marginRight="11dp" - android:background="@drawable/bg_user_home_normal_btn" + android:background="@drawable/background_shape_round_white_alpha_20" android:gravity="center" android:orientation="horizontal" android:textColor="@color/text_white" @@ -561,7 +561,7 @@ android:layout_width="110dp" android:layout_height="24dp" android:layout_marginTop="4dp" - android:background="@drawable/bg_user_home_normal_btn" + android:background="@drawable/background_shape_round_white_alpha_20" android:gravity="center" android:orientation="horizontal" app:layout_constraintRight_toRightOf="@+id/user_change_bg_btn" @@ -708,7 +708,7 @@ android:id="@+id/tabIndicator" android:layout_width="match_parent" android:layout_height="8dp" - app:indicatorDrawable="@drawable/ic_forum_tab_indicator" + app:indicatorDrawable="@drawable/ic_commodity_selected" app:layout_constraintTop_toBottomOf="@id/tabLayout" /> + - - - - - - - - - - - - + android:layout_height="match_parent"> - - - - - - - - - + android:background="@color/white" + android:clipToPadding="false" /> - + - - + + + + + + + diff --git a/app/src/main/res/layout/fragment_main_home_wrapper.xml b/app/src/main/res/layout/fragment_main_home_wrapper.xml index b7648130d3..0dbec56080 100644 --- a/app/src/main/res/layout/fragment_main_home_wrapper.xml +++ b/app/src/main/res/layout/fragment_main_home_wrapper.xml @@ -60,7 +60,7 @@ android:layout_height="8dp" android:layout_alignParentBottom="true" app:disableIndicatorScaling="true" - app:indicatorDrawable="@drawable/ic_forum_tab_indicator" /> + app:indicatorDrawable="@drawable/ic_commodity_selected" /> - + - - - - - - - - - + android:layout_height="match_parent" + android:layout="@layout/fragment_new_personal" /> + diff --git a/app/src/main/res/layout/fragment_package_check.xml b/app/src/main/res/layout/fragment_package_check.xml index bfc7f1e466..e39e57b8aa 100644 --- a/app/src/main/res/layout/fragment_package_check.xml +++ b/app/src/main/res/layout/fragment_package_check.xml @@ -1,147 +1,142 @@ - + - + android:layout_marginLeft="24dp" + android:layout_marginRight="24dp" + android:drawableLeft="@drawable/ic_dialog_tips" + android:drawablePadding="4dp" + android:text="温馨提示" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + + + + - - - - + android:overScrollMode="never" /> + - - + - + - + - + - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_personal_stub.xml b/app/src/main/res/layout/fragment_personal_stub.xml index 07fe4e8511..d0aadc4824 100644 --- a/app/src/main/res/layout/fragment_personal_stub.xml +++ b/app/src/main/res/layout/fragment_personal_stub.xml @@ -1,18 +1,12 @@ - + - - - - - + android:layout_height="match_parent" + android:layout="@layout/fragment_personal" /> + - - - diff --git a/app/src/main/res/layout/fragment_photo_poster.xml b/app/src/main/res/layout/fragment_photo_poster.xml index a42361f221..7e4f011f5a 100644 --- a/app/src/main/res/layout/fragment_photo_poster.xml +++ b/app/src/main/res/layout/fragment_photo_poster.xml @@ -1,14 +1,12 @@ - + - + android:layout_height="match_parent" /> - + - - diff --git a/app/src/main/res/layout/fragment_qa_category.xml b/app/src/main/res/layout/fragment_qa_category.xml index d4ed98cd26..34ced57d36 100644 --- a/app/src/main/res/layout/fragment_qa_category.xml +++ b/app/src/main/res/layout/fragment_qa_category.xml @@ -1,31 +1,28 @@ - + - + android:layout_height="match_parent" /> - + - - - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_region_wrapper.xml b/app/src/main/res/layout/fragment_region_wrapper.xml deleted file mode 100644 index 5edb365cb1..0000000000 --- a/app/src/main/res/layout/fragment_region_wrapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search_default.xml b/app/src/main/res/layout/fragment_search_default.xml index b6af7fffa9..39d8a9649c 100644 --- a/app/src/main/res/layout/fragment_search_default.xml +++ b/app/src/main/res/layout/fragment_search_default.xml @@ -1,134 +1,108 @@ - + - - - - - - - - - - + android:layout_height="wrap_content" + android:includeFontPadding="false" + android:padding="16dp" + android:text="@string/search_history" + android:textColor="@color/text_0E0E0E" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + + + + - - - - - - - - - + app:dividerDrawable="@drawable/shape_label_flexbox_divider" + app:flexWrap="wrap" + app:showDivider="middle" /> + - + + + + - - - - - + app:dividerDrawable="@drawable/shape_label_flexbox_divider" + app:flexWrap="wrap" + app:showDivider="middle" /> + - - - + + + + diff --git a/app/src/main/res/layout/fragment_sub_catalog.xml b/app/src/main/res/layout/fragment_sub_catalog.xml index b42b6ac131..e526044dc7 100644 --- a/app/src/main/res/layout/fragment_sub_catalog.xml +++ b/app/src/main/res/layout/fragment_sub_catalog.xml @@ -1,29 +1,27 @@ - - + + + android:background="@color/white" /> - + - + - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/fragment_user_game.xml b/app/src/main/res/layout/fragment_user_game.xml index 62c122b77b..f36d172928 100644 --- a/app/src/main/res/layout/fragment_user_game.xml +++ b/app/src/main/res/layout/fragment_user_game.xml @@ -22,7 +22,7 @@ android:id="@+id/gameCollectionType" android:layout_width="wrap_content" android:layout_height="28dp" - android:background="@drawable/button_round_f0f8ff" + android:background="@drawable/button_round_ebf5ff" android:gravity="center" android:paddingLeft="12dp" android:paddingRight="12dp" diff --git a/app/src/main/res/layout/fragment_user_publish.xml b/app/src/main/res/layout/fragment_user_publish.xml index 102c333609..a4fa59fbca 100644 --- a/app/src/main/res/layout/fragment_user_publish.xml +++ b/app/src/main/res/layout/fragment_user_publish.xml @@ -24,7 +24,7 @@ android:id="@+id/allType" style="@style/UserHomeFilterItem" android:layout_marginLeft="0dp" - android:background="@drawable/button_round_f0f8ff" + android:background="@drawable/button_round_ebf5ff" android:textColor="@color/theme_font" android:text="全部" /> diff --git a/app/src/main/res/layout/fragment_video_poster.xml b/app/src/main/res/layout/fragment_video_poster.xml index 703b16eac1..1cdfb38e63 100644 --- a/app/src/main/res/layout/fragment_video_poster.xml +++ b/app/src/main/res/layout/fragment_video_poster.xml @@ -1,33 +1,30 @@ - + - + + + android:layout_height="112dp" + android:background="@color/text_28282E" + android:paddingLeft="20dp" + android:paddingTop="24dp" + android:paddingRight="20dp" + android:paddingBottom="24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" /> - + - - - - - diff --git a/app/src/main/res/layout/game_attach_item.xml b/app/src/main/res/layout/game_attach_item.xml index 9fd03e3869..c07d8650a0 100644 --- a/app/src/main/res/layout/game_attach_item.xml +++ b/app/src/main/res/layout/game_attach_item.xml @@ -1,91 +1,76 @@ - - - - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + android:id="@+id/game_icon_container" + android:layout_width="52dp" + android:layout_height="58dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> - + + + + + + + + diff --git a/app/src/main/res/layout/game_collection_amway_content_item.xml b/app/src/main/res/layout/game_collection_amway_content_item.xml index f59a0152b8..b9c3c19d8a 100644 --- a/app/src/main/res/layout/game_collection_amway_content_item.xml +++ b/app/src/main/res/layout/game_collection_amway_content_item.xml @@ -1,46 +1,36 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - - + + - + android:layout_height="wrap_content" + android:layout_marginStart="5dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:lines="1" + android:textColor="@color/white_alpha_80" + android:textSize="@dimen/tag_text_size" + tools:text="我真的真的很喜欢这款游戏，没有重氪那么我真的真的很喜欢这款游戏，没有重氪那么我真的真的很喜欢这款游戏，没有重氪那么" /> - - - - - - - - - \ No newline at end of file + 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 9f64de8826..293dfe3ff8 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 @@ -1,172 +1,152 @@ - + - - + - + - - - - - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - + - - - - - - - - - - + android:layout_height="wrap_content" + app:avatar_width="22dp" + app:badge_width="8dp" + app:border_ratio="1" + app:border_width="0dp" + tools:layout_height="22dp" + tools:layout_width="22dp" /> + tools:text="测试用户名" /> + - - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_detail_video_item.xml b/app/src/main/res/layout/game_collection_detail_video_item.xml index 2600b74c03..3b9856d4b4 100644 --- a/app/src/main/res/layout/game_collection_detail_video_item.xml +++ b/app/src/main/res/layout/game_collection_detail_video_item.xml @@ -1,159 +1,140 @@ - + - - + + + - - - - - - - - + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:background="@drawable/bg_game_collection_video_item"> - - - - - + android:layout_marginLeft="17dp" + android:layout_marginRight="29dp" + android:includeFontPadding="false" + android:maxLines="2" + android:lineSpacingExtra="2dp" + android:textColor="@color/text_title" + android:textStyle="bold" + android:textSize="20sp" + tools:text="MOBA 手游集合，绝不氪金 5V5 公平对战" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/tagIv" + app:layout_constraintTop_toTopOf="parent" /> - + - + - + - - - - - - + android:layout_height="wrap_content" + app:avatar_width="24dp" + app:badge_width="8dp" + app:border_width="0dp" + app:border_ratio="1" + tools:layout_height="24dp" + tools:layout_width="24dp" /> + tools:text="测试用户名" /> + - - - - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_game_item.xml b/app/src/main/res/layout/game_collection_game_item.xml index f357dd54cf..19b185fcb5 100644 --- a/app/src/main/res/layout/game_collection_game_item.xml +++ b/app/src/main/res/layout/game_collection_game_item.xml @@ -1,48 +1,38 @@ - - - + - - + - - - - - - - \ No newline at end of file + android:layout_marginTop="12dp" + android:paddingTop="7dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingBottom="7dp" + android:includeFontPadding="false" + android:ellipsize="end" + android:maxLines="3" + android:background="@drawable/bg_shape_f8_radius_8" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + tools:text="跑跑卡丁车的手游版作为一部致敬经典的作品，在人物和地图上都有基本还原端游，但是手感有些区别" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@+id/game_item_included" + app:layout_constraintBottom_toBottomOf="parent" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/game_collection_item.xml b/app/src/main/res/layout/game_collection_item.xml index 23d59cacf6..8a89437896 100644 --- a/app/src/main/res/layout/game_collection_item.xml +++ b/app/src/main/res/layout/game_collection_item.xml @@ -1,308 +1,273 @@ - + - - - - - - - - - - - - + + + + + android:layout_marginStart="16dp" + android:layout_marginTop="18dp" + android:layout_marginEnd="16dp" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintEnd_toStartOf="@+id/tagIv" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="刺激游戏大合集" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + tools:text="999" /> - - + app:layout_constraintLeft_toRightOf="@+id/comment_count_container" + app:layout_constraintRight_toLeftOf="@+id/vote_count" + app:layout_constraintTop_toTopOf="parent" /> + + + + + + - - - - - - - - - - - - + - \ No newline at end of file + \ No newline at end of file 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 5405d5939a..c4ddb0cbbe 100644 --- a/app/src/main/res/layout/game_comment_log_item.xml +++ b/app/src/main/res/layout/game_comment_log_item.xml @@ -1,19 +1,5 @@ - - - - - - - - - - - - - - + @@ -81,7 +62,6 @@ android:minWidth="14dp" android:minHeight="14dp" android:numStars="5" - android:rating="@{data.star}" app:layout_constraintBottom_toBottomOf="@+id/user_icon_container" app:layout_constraintLeft_toRightOf="@+id/user_icon_container" app:layout_constraintTop_toBottomOf="@+id/user_name" @@ -94,7 +74,6 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:gravity="center" - android:text="@{NewsUtils.getFormattedTime(data.time)}" android:textColor="@color/hint" android:textSize="12sp" app:layout_constraintBottom_toBottomOf="@+id/user_icon_container" @@ -116,4 +95,3 @@ tools:text="每个评论的正文，最多显示4行，超过则使用省略号…全部，点击[全部]即可展开余下全文" /> - diff --git a/app/src/main/res/layout/game_head_item.xml b/app/src/main/res/layout/game_head_item.xml index 55084e99ad..09dd43e5bf 100644 --- a/app/src/main/res/layout/game_head_item.xml +++ b/app/src/main/res/layout/game_head_item.xml @@ -1,60 +1,49 @@ - + - - - - - - - - + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="@dimen/home_item_padding" + android:paddingRight="@dimen/home_item_padding"> - + android:includeFontPadding="false" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="18sp" + android:textStyle="bold" + tools:text="人气手游风向标" /> - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/game_horizontal_item.xml b/app/src/main/res/layout/game_horizontal_item.xml index 13da25ed46..1f9c33cadc 100644 --- a/app/src/main/res/layout/game_horizontal_item.xml +++ b/app/src/main/res/layout/game_horizontal_item.xml @@ -1,150 +1,122 @@ - - - - - - - - - - - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingTop="6dp" + android:paddingBottom="6dp" + tools:background="@color/white"> + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" + tools:text="9.3" /> + + + + + + - + + + + + + + + + + + + diff --git a/app/src/main/res/layout/game_horizontal_simple_item.xml b/app/src/main/res/layout/game_horizontal_simple_item.xml index ad93adb830..c2b7f33bf0 100644 --- a/app/src/main/res/layout/game_horizontal_simple_item.xml +++ b/app/src/main/res/layout/game_horizontal_simple_item.xml @@ -1,41 +1,28 @@ - + - + - - - - + android:layout_marginTop="8dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:maxLines="2" + android:textColor="@color/text_title" + android:textSize="12sp" + tools:text="超杀默示录" /> - - - - - - - + diff --git a/app/src/main/res/layout/game_image_item.xml b/app/src/main/res/layout/game_image_item.xml index 6c11688f59..a68f8479d3 100644 --- a/app/src/main/res/layout/game_image_item.xml +++ b/app/src/main/res/layout/game_image_item.xml @@ -1,113 +1,83 @@ - + - - - - - - - - - - - - - - + android:layout_height="wrap_content" + fresco:actualImageScaleType="centerCrop" + fresco:backgroundImage="@color/placeholder_bg" + fresco:fadeDuration="500" + fresco:layout_constraintLeft_toLeftOf="parent" + fresco:layout_constraintTop_toTopOf="parent" + fresco:placeholderImage="@drawable/preload" + fresco:pressedStateOverlayImage="@color/pressed_bg" + fresco:viewAspectRatio="2.14" /> - + - - - - - - - - - - - + + android:layout_marginTop="4dp" + android:textColor="@android:color/white" + android:textSize="12sp" /> - - + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/game_image_slide_item.xml b/app/src/main/res/layout/game_image_slide_item.xml index 85027831e3..a738ebe6ee 100644 --- a/app/src/main/res/layout/game_image_slide_item.xml +++ b/app/src/main/res/layout/game_image_slide_item.xml @@ -1,77 +1,76 @@ - + - + + + android:layout_height="0dp" + android:background="#30000000" + app:actualImageScaleType="centerCrop" + app:backgroundImage="@color/placeholder_bg" + app:fadeDuration="500" + app:layout_constraintBottom_toBottomOf="@id/guide_place" + app:layout_constraintRight_toRightOf="@id/guide_place" + app:layout_constraintTop_toTopOf="@id/guide_place" + app:placeholderImage="@drawable/preload" + app:pressedStateOverlayImage="@color/pressed_bg" /> - + - + - + - + - + - - - - diff --git a/app/src/main/res/layout/game_item.xml b/app/src/main/res/layout/game_item.xml index 42e66006a3..7e25e4d99d 100644 --- a/app/src/main/res/layout/game_item.xml +++ b/app/src/main/res/layout/game_item.xml @@ -1,343 +1,303 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/reuse_listview_item_style" + android:gravity="center_vertical" + android:orientation="horizontal" + android:padding="@dimen/home_item_padding"> - + - + - + - + - + - + - + - - + + + + + + + + + + + + android:id="@+id/recommendContainer" + android:layout_width="wrap_content" + android:layout_height="18dp" + android:layout_marginTop="3dp" + android:background="@drawable/bg_game_item_recommend" + android:paddingStart="4dp" + android:paddingEnd="8dp" + android:visibility="gone" + app:layout_constrainedWidth="true" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintLeft_toLeftOf="@+id/gameDesSpace" + app:layout_constraintRight_toRightOf="@+id/gameDesSpace" + app:layout_constraintTop_toTopOf="@+id/gameDesSpace"> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/recommendIv" + app:layout_constraintTop_toTopOf="parent" + app:layout_goneMarginStart="4dp" + tools:text="最新活动火爆来袭" /> + - + + + + + + + + + + + diff --git a/app/src/main/res/layout/game_latest_service_list.xml b/app/src/main/res/layout/game_latest_service_list.xml index 16c546edad..0be417fb78 100644 --- a/app/src/main/res/layout/game_latest_service_list.xml +++ b/app/src/main/res/layout/game_latest_service_list.xml @@ -71,7 +71,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:drawableLeft="@drawable/ic_open_service_tips" + android:drawableLeft="@drawable/servers_calendar_hint" android:drawablePadding="4dp" android:text="请以游戏内实际开服为准" android:textColor="@color/text_subtitleDesc" diff --git a/app/src/main/res/layout/game_permission_dialog.xml b/app/src/main/res/layout/game_permission_dialog.xml index f2f0b2890b..2d66d0fb08 100644 --- a/app/src/main/res/layout/game_permission_dialog.xml +++ b/app/src/main/res/layout/game_permission_dialog.xml @@ -1,178 +1,175 @@ - + - + android:layout_height="wrap_content" + app:cardBackgroundColor="@color/white" + app:cardCornerRadius="8dp" + app:cardElevation="0dp"> - + android:layout_height="wrap_content"> - + + + android:layout_height="wrap_content" + android:layout_marginLeft="92dp" + android:layout_marginTop="19dp" + android:layout_marginRight="16dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="少年三国志2" /> - + + + + + + + + android:layout_centerVertical="true" + android:layout_marginLeft="12dp" + android:layout_toRightOf="@id/privacyIv" + android:text="隐私政策" + android:textColor="@color/text_title" /> - + - + - + - + - + - + - + + + - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/game_permission_item.xml b/app/src/main/res/layout/game_permission_item.xml index 94f62d8b62..b7c8228242 100644 --- a/app/src/main/res/layout/game_permission_item.xml +++ b/app/src/main/res/layout/game_permission_item.xml @@ -1,8 +1,7 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/game_viewpager_item.xml b/app/src/main/res/layout/game_viewpager_item.xml index b32b11c526..cda74f4dd5 100644 --- a/app/src/main/res/layout/game_viewpager_item.xml +++ b/app/src/main/res/layout/game_viewpager_item.xml @@ -1,228 +1,201 @@ - + + - - - - - - - - - - - - - - + - + android:visibility="visible" + app:fractionValue="0.4375" + app:measureBy="width"> - - + android:layout_height="match_parent" + android:overScrollMode="never" /> - + + + + + + + + + + + + - - + android:orientation="vertical"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml index aa3eef97f1..779a368114 100644 --- a/app/src/main/res/layout/gamedetail_item_custom_column_item.xml +++ b/app/src/main/res/layout/gamedetail_item_custom_column_item.xml @@ -1,24 +1,21 @@ - + - + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:maxLines="4" + android:textColor="@color/text_subtitle" + android:textSize="13sp" + tools:text="sample" /> - - - - + diff --git a/app/src/main/res/layout/help_category_item.xml b/app/src/main/res/layout/help_category_item.xml index b265a3c582..f8e71755f8 100644 --- a/app/src/main/res/layout/help_category_item.xml +++ b/app/src/main/res/layout/help_category_item.xml @@ -1,31 +1,28 @@ - + - + + + android:layout_marginLeft="4dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="14sp" + android:textStyle="bold" /> - - - - - - + diff --git a/app/src/main/res/layout/help_item.xml b/app/src/main/res/layout/help_item.xml index ee04287a9c..ccd1943e4b 100644 --- a/app/src/main/res/layout/help_item.xml +++ b/app/src/main/res/layout/help_item.xml @@ -1,36 +1,34 @@ - + - + android:layout_height="8dp" + android:background="@color/background" + android:visibility="gone" /> - + - - - - - + + diff --git a/app/src/main/res/layout/help_qa_category_item.xml b/app/src/main/res/layout/help_qa_category_item.xml index 79c25d47a8..30d6617631 100644 --- a/app/src/main/res/layout/help_qa_category_item.xml +++ b/app/src/main/res/layout/help_qa_category_item.xml @@ -1,96 +1,86 @@ - + - + - - - - + android:background="@color/white"> - - - + android:layout_marginLeft="20dp" + android:gravity="center_horizontal" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + android:layout_marginTop="16dp" + android:text="更多 >" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" /> + - - - - - - - - + - - - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/home_amway_item.xml b/app/src/main/res/layout/home_amway_item.xml index 091e2eb99f..be429de70a 100644 --- a/app/src/main/res/layout/home_amway_item.xml +++ b/app/src/main/res/layout/home_amway_item.xml @@ -1,231 +1,213 @@ - + - + - - + - + android:layout_marginLeft="12dp" + android:layout_marginTop="8dp" + android:layout_marginRight="12dp" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintLeft_toRightOf="@id/game_icon" + app:layout_constraintRight_toRightOf="@id/amway_background" + app:layout_constraintTop_toTopOf="@id/amway_background" + tools:text="泡面三国" /> - + - + + + + + + + - - + android:textSize="13sp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="面提升中希合作交流水平 推动金砖峰会取得丰硕成果,写在习近平主席对希腊进行国事访问并赴巴西出席金砖国家领导人第十一次会晤之际　" /> - - - - - - - - - - - - - - - - - - - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@id/content"> + android:id="@+id/user_icon" + style="@style/frescoCircleStyle" + android:layout_width="20dp" + android:layout_height="20dp" /> - - - + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" /> - + + + + app:layout_constraintBottom_toBottomOf="@id/user_name" + app:layout_constraintLeft_toRightOf="@id/user_name" + app:layout_constraintTop_toTopOf="@id/user_name" /> + + + + - + + + + diff --git a/app/src/main/res/layout/home_game_item.xml b/app/src/main/res/layout/home_game_item.xml index e1c33b1b4a..a38d65ecdd 100644 --- a/app/src/main/res/layout/home_game_item.xml +++ b/app/src/main/res/layout/home_game_item.xml @@ -1,152 +1,139 @@ - + - - - - - - - + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> - - - - - - + + + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginRight="32dp" + app:layout_constraintEnd_toStartOf="@+id/game_rating" + app:layout_constraintStart_toStartOf="@id/game_name" + app:layout_constraintTop_toBottomOf="@+id/game_name" /> + + + - + + + + + + + + + + + diff --git a/app/src/main/res/layout/home_recommend_item.xml b/app/src/main/res/layout/home_recommend_item.xml index e4ca3dbc11..5a3cd9b9ea 100644 --- a/app/src/main/res/layout/home_recommend_item.xml +++ b/app/src/main/res/layout/home_recommend_item.xml @@ -1,178 +1,156 @@ - + - - - - - - - - - - - - + android:gravity="center_horizontal" + android:orientation="vertical"> - + + + android:layout_marginTop="8dp" + android:textColor="@color/text_title" + android:textSize="12sp" + tools:text="分类" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/home_slide_list_item.xml b/app/src/main/res/layout/home_slide_list_item.xml index 0bf93ca0b9..8415396371 100644 --- a/app/src/main/res/layout/home_slide_list_item.xml +++ b/app/src/main/res/layout/home_slide_list_item.xml @@ -1,128 +1,108 @@ - + - - - - - - - - - - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:roundedCornerRadius="5dp" + app:viewAspectRatio="1.2" /> - + - + - + - + - + - + - + - - diff --git a/app/src/main/res/layout/hot_forum_item.xml b/app/src/main/res/layout/hot_forum_item.xml index 778d0780ba..0c2d2ce4fa 100644 --- a/app/src/main/res/layout/hot_forum_item.xml +++ b/app/src/main/res/layout/hot_forum_item.xml @@ -1,57 +1,49 @@ - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:paddingLeft="16dp" + android:paddingTop="8dp" + android:paddingRight="16dp" + android:paddingBottom="8dp"> - + + + android:layout_marginLeft="12dp" + android:layout_marginRight="20dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@+id/forumIv" + app:layout_constraintLeft_toRightOf="@+id/forumIv" + app:layout_constraintRight_toLeftOf="@+id/followTv" + app:layout_constraintTop_toTopOf="@+id/forumIv" + tools:text="龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷龙之谷" /> - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/imprint_content_item.xml b/app/src/main/res/layout/imprint_content_item.xml index 1510489e20..dd27a8e8b2 100644 --- a/app/src/main/res/layout/imprint_content_item.xml +++ b/app/src/main/res/layout/imprint_content_item.xml @@ -1,71 +1,45 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - + + 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 825e4e744d..15aa19c05c 100644 --- a/app/src/main/res/layout/item_article_detail_comment.xml +++ b/app/src/main/res/layout/item_article_detail_comment.xml @@ -1,343 +1,320 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/white"> - - - - - - - - + + android:layout_marginLeft="3dp" + android:layout_marginTop="8dp" + android:layout_marginRight="24dp" + app:layout_constraintEnd_toStartOf="@+id/moreIv" + app:layout_constraintStart_toEndOf="@id/userIconIv" + app:layout_constraintTop_toTopOf="@id/userIconIv"> - + tools:text="孙一峰" /> - + + + + - - - - - - - - - - - - - - + android:layout_marginRight="32dp" + android:gravity="center" + android:includeFontPadding="false" + android:textColor="@color/text_subtitleDesc" + android:textSize="10sp" + android:visibility="gone" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="@+id/userNameTv" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@+id/badgeIv" + app:layout_constraintTop_toTopOf="@+id/userNameTv" + tools:text="答题先锋" /> + android:id="@+id/topLabelIv" + android:layout_width="26dp" + android:layout_height="14dp" + android:layout_marginTop="3dp" + android:src="@drawable/ic_article_comment_top" + app:layout_constraintStart_toStartOf="@id/userNameTv" + app:layout_constraintTop_toBottomOf="@id/userNameTv" + tools:visibility="gone" /> - - - - - - - - - - - - - - - - + android:textSize="11sp" + app:layout_constraintStart_toEndOf="@+id/topLabelIv" + app:layout_constraintTop_toBottomOf="@id/userNameTv" + tools:text="一个小时前" /> - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_article_detail_comment_footer.xml b/app/src/main/res/layout/item_article_detail_comment_footer.xml index 641ebd6375..dab8870a89 100644 --- a/app/src/main/res/layout/item_article_detail_comment_footer.xml +++ b/app/src/main/res/layout/item_article_detail_comment_footer.xml @@ -1,33 +1,30 @@ - + - + android:layout_height="48dp" + android:gravity="center" + android:orientation="horizontal"> - + - + + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_category.xml b/app/src/main/res/layout/item_category.xml index 6a687aae29..c12219c9b8 100644 --- a/app/src/main/res/layout/item_category.xml +++ b/app/src/main/res/layout/item_category.xml @@ -1,107 +1,90 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - - - - - - - - - - + android:layout_height="8dp" + android:background="@color/background" /> - + + + android:layout_height="wrap_content" + android:layout_marginTop="37dp"> + + + + + + + + + + + + + + + + + android:layout_height="37dp" + android:layout_below="@id/container_category"> - - - - - - - - - - - - - - - - - - - - - - - + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:paddingLeft="20dp" + android:paddingTop="20dp" + android:paddingRight="20dp" + android:paddingBottom="10dp" + android:src="@drawable/ic_category_arrow_down" + android:visibility="gone" + tools:visibility="visible" /> - - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_comment_picture.xml b/app/src/main/res/layout/item_comment_picture.xml index 228f4ea689..e3990273f3 100644 --- a/app/src/main/res/layout/item_comment_picture.xml +++ b/app/src/main/res/layout/item_comment_picture.xml @@ -1,32 +1,22 @@ - + - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_filter_commodity_size.xml b/app/src/main/res/layout/item_filter_commodity_size.xml index a2cfd91aae..60fdf7bf4b 100644 --- a/app/src/main/res/layout/item_filter_commodity_size.xml +++ b/app/src/main/res/layout/item_filter_commodity_size.xml @@ -1,21 +1,19 @@ - - + - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_forum_follow.xml b/app/src/main/res/layout/item_forum_follow.xml index b2d3f5ce03..4c1df92c51 100644 --- a/app/src/main/res/layout/item_forum_follow.xml +++ b/app/src/main/res/layout/item_forum_follow.xml @@ -1,49 +1,41 @@ - + - - - + - + - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_forum_video.xml b/app/src/main/res/layout/item_forum_video.xml index 45c8a57f5e..c045ba238c 100644 --- a/app/src/main/res/layout/item_forum_video.xml +++ b/app/src/main/res/layout/item_forum_video.xml @@ -1,106 +1,89 @@ - + - + - + - - - - + android:layout_margin="4dp" + android:background="@drawable/bg_shape_black_alpha_30_radius_2" + android:gravity="center" + android:includeFontPadding="false" + android:paddingLeft="2dp" + android:paddingTop="1dp" + android:paddingRight="2dp" + android:paddingBottom="1dp" + android:textColor="@color/white" + android:textSize="10sp" + app:layout_constraintBottom_toBottomOf="@+id/video_poster" + app:layout_constraintEnd_toEndOf="@+id/video_poster" /> - + - + - - - - - - - + - - \ No newline at end of file + 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 9aca821002..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 @@ -12,7 +12,7 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_latest_service.xml b/app/src/main/res/layout/item_game_detail_latest_service.xml index 33ac890c10..f17698073f 100644 --- a/app/src/main/res/layout/item_game_detail_latest_service.xml +++ b/app/src/main/res/layout/item_game_detail_latest_service.xml @@ -1,39 +1,37 @@ - + - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_detail_rating_comment.xml b/app/src/main/res/layout/item_game_detail_rating_comment.xml index 365180ef3f..3111679a29 100644 --- a/app/src/main/res/layout/item_game_detail_rating_comment.xml +++ b/app/src/main/res/layout/item_game_detail_rating_comment.xml @@ -1,185 +1,163 @@ - + - - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginLeft="8dp" + android:layout_marginRight="12dp" + android:gravity="left" + android:orientation="horizontal" + app:layout_constraintBottom_toTopOf="@+id/rating_start" + app:layout_constraintLeft_toRightOf="@+id/user_icon_container" + app:layout_constraintRight_toLeftOf="@+id/more" + app:layout_constraintTop_toTopOf="@+id/user_icon_container"> + + + + - - - - - - + app:layout_constraintTop_toTopOf="@id/sdv_user_badge" + tools:text="答题先锋" /> - + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_game_detail_related_version.xml b/app/src/main/res/layout/item_game_detail_related_version.xml index 4bcd3c1019..1a67cabfba 100644 --- a/app/src/main/res/layout/item_game_detail_related_version.xml +++ b/app/src/main/res/layout/item_game_detail_related_version.xml @@ -1,50 +1,39 @@ - + - + - - + - + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_libao.xml b/app/src/main/res/layout/item_game_libao.xml index b10c35d03f..4a0cc56b7f 100644 --- a/app/src/main/res/layout/item_game_libao.xml +++ b/app/src/main/res/layout/item_game_libao.xml @@ -1,116 +1,114 @@ - + - + android:drawableLeft="@drawable/ic_game_detail_libao" + android:drawablePadding="4dp" + android:textColor="@color/text_title" + android:textSize="13sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="新春大礼包" /> - + + - - - - - - - - - - - - - - - - + + + + + + + - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_game_raiders.xml b/app/src/main/res/layout/item_game_raiders.xml index 1a49618803..f0814195ed 100644 --- a/app/src/main/res/layout/item_game_raiders.xml +++ b/app/src/main/res/layout/item_game_raiders.xml @@ -1,64 +1,62 @@ - + - + - + - + - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_history_apk.xml b/app/src/main/res/layout/item_history_apk.xml index 8f94d8b1d4..1f85405cb3 100644 --- a/app/src/main/res/layout/item_history_apk.xml +++ b/app/src/main/res/layout/item_history_apk.xml @@ -1,79 +1,67 @@ - + - + - - + - + + + android:layout_marginTop="11dp" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:maxLines="3" + android:textColor="@color/text_title" + android:textSize="13sp" + app:endText="... " + app:expandText="展开" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/downloadBtn" + app:useGradientAlphaEndText="true" /> - - - - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_home_played_game.xml b/app/src/main/res/layout/item_home_played_game.xml deleted file mode 100644 index 4d29517d4c..0000000000 --- a/app/src/main/res/layout/item_home_played_game.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_my_game_collection.xml b/app/src/main/res/layout/item_my_game_collection.xml index b1c7a9b449..7aa98f718a 100644 --- a/app/src/main/res/layout/item_my_game_collection.xml +++ b/app/src/main/res/layout/item_my_game_collection.xml @@ -1,171 +1,152 @@ - + - - - - - - - - - + + + + + android:layout_marginLeft="16dp" + android:layout_marginTop="18dp" + android:layout_marginRight="16dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:maxLines="2" + android:textColor="@color/white" + android:textSize="@dimen/secondary_title_text_size" + app:layout_constraintEnd_toStartOf="@+id/actionContainer" + app:layout_constraintStart_toStartOf="@+id/posterView" + app:layout_constraintTop_toTopOf="@+id/posterView" + tools:text="刺激游戏大合集" /> - + - + - + - + - + - + + - + - + + - - + - + + + - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_my_game_rating.xml b/app/src/main/res/layout/item_my_game_rating.xml index 2f96abeb03..6ba7e21423 100644 --- a/app/src/main/res/layout/item_my_game_rating.xml +++ b/app/src/main/res/layout/item_my_game_rating.xml @@ -1,202 +1,185 @@ - + 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:paddingLeft="20dp" + android:paddingTop="16dp" + android:paddingRight="20dp"> - - - - - - - - + android:background="@color/white"> - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/gameScoreRl" + app:layout_constraintStart_toEndOf="@+id/gameIconRl" + app:layout_constraintTop_toTopOf="parent"> - - - - + android:textSize="14sp" + android:textStyle="bold" + fresco:text="冒险岛3" /> + + + + + + + + android:layout_centerInParent="true" + android:textColor="@android:color/white" + android:textSize="10sp" + fresco:text="评分过少" /> + - - - - + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_qa_feedback_reason.xml b/app/src/main/res/layout/item_qa_feedback_reason.xml index ba29862492..66dc757911 100644 --- a/app/src/main/res/layout/item_qa_feedback_reason.xml +++ b/app/src/main/res/layout/item_qa_feedback_reason.xml @@ -1,26 +1,17 @@ - - - - + - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/item_skeleton_game_collection_detail_game.xml b/app/src/main/res/layout/item_skeleton_game_collection_detail_game.xml new file mode 100644 index 0000000000..0f471df237 --- /dev/null +++ b/app/src/main/res/layout/item_skeleton_game_collection_detail_game.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_usage_stats.xml b/app/src/main/res/layout/item_usage_stats.xml new file mode 100644 index 0000000000..1eaa5415f0 --- /dev/null +++ b/app/src/main/res/layout/item_usage_stats.xml @@ -0,0 +1,29 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_comment_history.xml b/app/src/main/res/layout/item_user_comment_history.xml index b5042ed9ad..741d45fb0d 100644 --- a/app/src/main/res/layout/item_user_comment_history.xml +++ b/app/src/main/res/layout/item_user_comment_history.xml @@ -1,182 +1,160 @@ - + - - + - - - - - - + android:layout_marginTop="16dp" + android:background="@drawable/bg_user_comment_game_info" + android:orientation="vertical"> - + - + + + + + + + + + + + + + + android:layout_marginTop="18dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:maxLines="4" + android:textColor="@color/text_subtitle" + android:textSize="13sp" + app:endText="... " + app:expandText="全部" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintTop_toBottomOf="@+id/rating_start" + app:useGradientAlphaEndText="true" + tools:text="面提升中希合作交流水平 推动金砖峰会取得丰硕成果,写在习近平主席对希腊进行国事访问并赴巴西出席金砖国家领导人第十一次会晤之际　" /> - + - + - + + + - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_video_desc_top.xml b/app/src/main/res/layout/item_video_desc_top.xml index e7c73bb8f5..5b843a6444 100644 --- a/app/src/main/res/layout/item_video_desc_top.xml +++ b/app/src/main/res/layout/item_video_desc_top.xml @@ -1,282 +1,247 @@ - + - - - - - - - - - + app:avatar_width="32dp" + app:badge_width="10dp" + app:border_color="@color/transparent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:layout_height="48dp" + tools:layout_width="48dp" /> + - + + + + + + + + + + + + + + + + + + + + + + + android:textSize="12sp" /> + - + + + + android:textSize="12sp" /> + + + + + - - - - - - - - - - - - - - - + android:layout_marginTop="8dp" + android:includeFontPadding="false" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" /> + - + - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/item_within_game_gallery_slide.xml b/app/src/main/res/layout/item_within_game_gallery_slide.xml index fc728b69e3..0d8df86b2e 100644 --- a/app/src/main/res/layout/item_within_game_gallery_slide.xml +++ b/app/src/main/res/layout/item_within_game_gallery_slide.xml @@ -1,23 +1,13 @@ - + - + - - + - - - - - - diff --git a/app/src/main/res/layout/kaifu_detail_item_row.xml b/app/src/main/res/layout/kaifu_detail_item_row.xml index e52f20602c..f5ffcd3c39 100644 --- a/app/src/main/res/layout/kaifu_detail_item_row.xml +++ b/app/src/main/res/layout/kaifu_detail_item_row.xml @@ -1,73 +1,45 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/layout_menu_my_ask_draft.xml b/app/src/main/res/layout/layout_menu_my_ask_draft.xml index aaef02bed7..1e91a0a603 100644 --- a/app/src/main/res/layout/layout_menu_my_ask_draft.xml +++ b/app/src/main/res/layout/layout_menu_my_ask_draft.xml @@ -9,7 +9,7 @@ android:layout_height="22dp" android:layout_centerInParent="true" android:layout_marginRight="15dp" - android:background="@drawable/button_border_1383eb_oval" + android:background="@drawable/button_border_blue_oval" android:gravity="center" android:paddingLeft="10dp" android:paddingRight="10dp" diff --git a/app/src/main/res/layout/layout_menu_question_and_answer.xml b/app/src/main/res/layout/layout_menu_question_and_answer.xml index 6b713fde99..8006cc0845 100644 --- a/app/src/main/res/layout/layout_menu_question_and_answer.xml +++ b/app/src/main/res/layout/layout_menu_question_and_answer.xml @@ -13,7 +13,7 @@ android:textSize = "12sp" android:paddingLeft="10dp" android:paddingRight="10dp" - android:background="@drawable/button_border_1383eb_oval" + android:background="@drawable/button_border_blue_oval" android:text = "进入问答" /> diff --git a/app/src/main/res/layout/layout_multi_input_item.xml b/app/src/main/res/layout/layout_multi_input_item.xml index 37ce0d9eae..45c50b0c35 100644 --- a/app/src/main/res/layout/layout_multi_input_item.xml +++ b/app/src/main/res/layout/layout_multi_input_item.xml @@ -20,6 +20,7 @@ android:hint="@string/introduce_hint" android:minLines="2" android:textColor="@color/text_title" + android:textColorHint="@color/text_body" android:textCursorDrawable="@drawable/cursor_color" android:textSize="@dimen/primary_text_size" app:layout_constraintBottom_toTopOf="@+id/countTv" diff --git a/app/src/main/res/layout/layout_setting_item.xml b/app/src/main/res/layout/layout_setting_item.xml index c780bfe417..4069469b17 100644 --- a/app/src/main/res/layout/layout_setting_item.xml +++ b/app/src/main/res/layout/layout_setting_item.xml @@ -55,7 +55,7 @@ android:layout_height="wrap_content" android:layout_marginTop="8dp" android:includeFontPadding="false" - android:lineSpacingExtra="4dp" + android:lineHeight="16dp" android:textColor="@color/text_subtitleDesc" android:textSize="@dimen/secondary_size" android:visibility="gone" diff --git a/app/src/main/res/layout/local_video_item.xml b/app/src/main/res/layout/local_video_item.xml index 14846accc1..99cd335cf6 100644 --- a/app/src/main/res/layout/local_video_item.xml +++ b/app/src/main/res/layout/local_video_item.xml @@ -1,58 +1,56 @@ - + - + android:layout_height="0dp" + app:layout_constraintDimensionRatio="w,1:1" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:roundedCornerRadius="2dp" + app:roundingBorderColor="@color/black_alpha_10" + app:roundingBorderWidth="0.5dp" /> - + - + - + + - - - diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml index 465239932e..0cd2ad6860 100644 --- a/app/src/main/res/layout/message_item.xml +++ b/app/src/main/res/layout/message_item.xml @@ -1,183 +1,168 @@ - + - + - - - + + + + + + + + + + + + + + + + + + - + android:id="@+id/message_data_icon_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + android:id="@+id/message_ask_icon" + android:layout_width="51dp" + android:layout_height="34dp" + android:layout_centerVertical="true" + app:fadeDuration="500" + app:placeholderImage="@drawable/message_ask_placeholder" + app:placeholderImageScaleType="fitXY" /> - + android:id="@+id/message_article_icon" + android:layout_width="51dp" + android:layout_height="34dp" + android:layout_centerVertical="true" + android:visibility="gone" + app:fadeDuration="500" + app:placeholderImage="@drawable/message_article_placeholder" + app:placeholderImageScaleType="fitXY" /> - + + + + android:id="@+id/message_original_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginLeft="10dp" + android:layout_marginRight="10dp" + android:layout_toRightOf="@+id/message_data_icon_container" + android:ellipsize="end" + android:maxLines="2" + android:textColor="@color/title" + android:textSize="12sp" /> + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/message_item_top.xml b/app/src/main/res/layout/message_item_top.xml index c0e1ce3cd5..426aabf671 100644 --- a/app/src/main/res/layout/message_item_top.xml +++ b/app/src/main/res/layout/message_item_top.xml @@ -1,206 +1,192 @@ - + - + - - - - - - - + android:layout_marginTop="16dp" + android:src="@drawable/message_vote_icon" + app:layout_constraintBottom_toTopOf="@+id/message_vote_name" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_chainStyle="packed" /> - - - - - - - - - - - + android:layout_marginLeft="14dp" + android:layout_marginTop="10dp" + android:background="@drawable/message_unread_hint" + android:gravity="center" + android:maxLength="3" + android:minWidth="13dp" + android:minHeight="1dp" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:textColor="@android:color/white" + android:textSize="9dp" + android:visibility="gone" + app:layout_constraintStart_toStartOf="@+id/guideline_vote" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - - - - - + android:layout_marginTop="8dp" + android:layout_marginBottom="16dp" + android:includeFontPadding="false" + android:text="赞同" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/message_vote_icon" /> - + - + - + - + - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/moderator_list_item.xml b/app/src/main/res/layout/moderator_list_item.xml index b0cc748f4e..e3f87ceb1d 100644 --- a/app/src/main/res/layout/moderator_list_item.xml +++ b/app/src/main/res/layout/moderator_list_item.xml @@ -1,91 +1,68 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/reuse_listview_item_style" + android:gravity="center_vertical" + android:paddingLeft="16dp" + android:paddingTop="12dp" + android:paddingRight="16dp" + android:paddingBottom="12dp"> - + - - - - - - - - - - - - - - - - - - + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp" + android:orientation="vertical" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/followTv" + app:layout_constraintStart_toEndOf="@+id/userIcon" + app:layout_constraintTop_toTopOf="parent"> + + - - \ No newline at end of file + tools:text="@string/app_name" /> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/novice_task_item.xml b/app/src/main/res/layout/novice_task_item.xml index 55a62aa432..e31cb78919 100644 --- a/app/src/main/res/layout/novice_task_item.xml +++ b/app/src/main/res/layout/novice_task_item.xml @@ -1,73 +1,63 @@ - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="16dp" + android:gravity="center_horizontal" + android:orientation="vertical"> - + + + android:layout_marginTop="9dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:maxEms="5" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintLeft_toLeftOf="@+id/taskIcon" + app:layout_constraintRight_toLeftOf="@+id/taskNotice" + app:layout_constraintTop_toBottomOf="@+id/taskIcon" + tools:text="绑定手机哈哈哈哈哈哈哈" /> - + - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/novice_tasks_item.xml b/app/src/main/res/layout/novice_tasks_item.xml index d329a2d096..fa6966cd47 100644 --- a/app/src/main/res/layout/novice_tasks_item.xml +++ b/app/src/main/res/layout/novice_tasks_item.xml @@ -1,27 +1,23 @@ - + - + android:layout_height="164dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="11dp" + android:layout_marginRight="16dp" + android:background="@drawable/bg_novice_tasks" + android:nestedScrollingEnabled="false" + android:paddingTop="43dp" /> - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/official_forum_item.xml b/app/src/main/res/layout/official_forum_item.xml index 30ce00b320..c3966385eb 100644 --- a/app/src/main/res/layout/official_forum_item.xml +++ b/app/src/main/res/layout/official_forum_item.xml @@ -1,43 +1,33 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp"> - - - + - - - - - - - \ No newline at end of file + android:layout_marginLeft="12dp" + android:ellipsize="end" + android:gravity="center" + android:includeFontPadding="false" + android:singleLine="true" + android:textColor="@color/text_title" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="@+id/forumIv" + app:layout_constraintLeft_toRightOf="@+id/forumIv" + app:layout_constraintTop_toTopOf="@+id/forumIv" + tools:text="龙之谷" /> + diff --git a/app/src/main/res/layout/package_check_item.xml b/app/src/main/res/layout/package_check_item.xml index 6eb5243120..4c130bfb13 100644 --- a/app/src/main/res/layout/package_check_item.xml +++ b/app/src/main/res/layout/package_check_item.xml @@ -1,46 +1,37 @@ - + - + - - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/personal_home_rating.xml b/app/src/main/res/layout/personal_home_rating.xml index d70c3fdef9..b262489e1b 100644 --- a/app/src/main/res/layout/personal_home_rating.xml +++ b/app/src/main/res/layout/personal_home_rating.xml @@ -1,131 +1,115 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/reuse_listview_item_style" + android:orientation="vertical" + android:paddingLeft="15dp" + android:paddingTop="11dp" + android:paddingRight="20dp"> - + - + - - - - + android:layout_marginLeft="5dp" + android:layout_marginTop="2dp" + android:ellipsize="end" + android:includeFontPadding="false" + android:lineSpacingExtra="4dp" + android:maxLines="3" + android:textColor="@color/text_subtitle" + android:textSize="13sp" + app:endText="... " + app:expandText="全部" + app:layout_constraintTop_toBottomOf="@id/user_icon" + app:useGradientAlphaEndText="true" /> - + - - - - - - - + - + - - + diff --git a/app/src/main/res/layout/photo_poster_item.xml b/app/src/main/res/layout/photo_poster_item.xml index acd249ffc6..9d5de72ce6 100644 --- a/app/src/main/res/layout/photo_poster_item.xml +++ b/app/src/main/res/layout/photo_poster_item.xml @@ -1,29 +1,27 @@ - + - + android:layout_height="wrap_content" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:viewAspectRatio="1" /> - + - + - - diff --git a/app/src/main/res/layout/piece_article_detail_comment_filter.xml b/app/src/main/res/layout/piece_article_detail_comment_filter.xml index b8f6abf064..bbc6aeaaa2 100644 --- a/app/src/main/res/layout/piece_article_detail_comment_filter.xml +++ b/app/src/main/res/layout/piece_article_detail_comment_filter.xml @@ -1,87 +1,84 @@ - + - + + + + + + + + + + + android:layout_height="0.5dp" + android:background="@color/divider" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/piece_community_vote_and_comment.xml b/app/src/main/res/layout/piece_community_vote_and_comment.xml index d978cd2bf9..11c6436782 100644 --- a/app/src/main/res/layout/piece_community_vote_and_comment.xml +++ b/app/src/main/res/layout/piece_community_vote_and_comment.xml @@ -1,79 +1,76 @@ - + - + - - - - - - - + android:paddingTop="20dp" + android:paddingBottom="20dp" + android:textColor="@color/text_subtitleDesc" + android:textSize="12sp" + tools:text="16" /> - + - + - + - - - + android:layout_centerInParent="true" + android:src="@drawable/community_vote_selector" /> - - - \ No newline at end of file + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/privacy_item.xml b/app/src/main/res/layout/privacy_item.xml index 87f34ec05f..76b13e58c3 100644 --- a/app/src/main/res/layout/privacy_item.xml +++ b/app/src/main/res/layout/privacy_item.xml @@ -1,59 +1,46 @@ - + - + - - - - + android:layout_marginLeft="12dp" + android:layout_marginRight="12dp" + android:includeFontPadding="false" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + app:layout_constraintLeft_toRightOf="@id/icon" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - - + diff --git a/app/src/main/res/layout/question_edit_title_search_item.xml b/app/src/main/res/layout/question_edit_title_search_item.xml index a6ae73f996..bd3084fdfa 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 @@ -1,50 +1,39 @@ - - - - + - + - + - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/question_history_item.xml b/app/src/main/res/layout/question_history_item.xml index e97a9763dd..41eb33b188 100644 --- a/app/src/main/res/layout/question_history_item.xml +++ b/app/src/main/res/layout/question_history_item.xml @@ -1,56 +1,44 @@ - + - + - - + - + - - - - - - - - + diff --git a/app/src/main/res/layout/questioninvite_header_item.xml b/app/src/main/res/layout/questioninvite_header_item.xml index af312b0f13..2868e6ed15 100644 --- a/app/src/main/res/layout/questioninvite_header_item.xml +++ b/app/src/main/res/layout/questioninvite_header_item.xml @@ -1,31 +1,20 @@ - + - - - - - - - - - - \ No newline at end of file + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:background="@color/background" + android:gravity="center_vertical" + android:paddingLeft="20dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" + android:textColor="@color/title" + android:textSize="11sp" + tools:text="系统推荐" /> + diff --git a/app/src/main/res/layout/questions_history_detail.xml b/app/src/main/res/layout/questions_history_detail.xml index 6efb1ca6e1..92c6bca68b 100644 --- a/app/src/main/res/layout/questions_history_detail.xml +++ b/app/src/main/res/layout/questions_history_detail.xml @@ -1,208 +1,182 @@ - + - + - + - + - + - + - + - + - + + android:id="@+id/question_history_picll" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="20dp" + android:layout_marginTop="8dp" + android:layout_marginRight="20dp"> - + - + - + + + + + android:id="@+id/question_history_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:textColor="@color/title" + android:textSize="12sp" /> - + + - + - - - - - - + + android:id="@+id/question_history_next" + android:layout_width="0dp" + android:layout_height="50dp" + android:layout_weight="1" + android:background="@android:color/white" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/question_history_line_center" + app:layout_constraintTop_toTopOf="@+id/question_history_line_center"> + android:id="@+id/question_history_next_tv" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:gravity="center" + android:textColor="@color/title" + android:textSize="14sp" /> - - + + android:id="@+id/question_history_line_center" + android:layout_width="1dp" + android:layout_height="50dp" + android:background="@color/cutting_line" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toBottomOf="@id/question_history_line_top" /> - + - + + - - - - - - - - - - - - - - - - + + + + diff --git a/app/src/main/res/layout/rating_comment_item.xml b/app/src/main/res/layout/rating_comment_item.xml index a165540c58..1ac001e2ef 100644 --- a/app/src/main/res/layout/rating_comment_item.xml +++ b/app/src/main/res/layout/rating_comment_item.xml @@ -1,346 +1,314 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginRight="8dp" + android:orientation="horizontal" + app:layout_constraintBottom_toTopOf="@+id/rating_start" + app:layout_constraintLeft_toRightOf="@+id/user_icon" + app:layout_constraintRight_toLeftOf="@+id/more" + app:layout_constraintTop_toTopOf="@+id/user_icon"> - - - - - - - + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toLeftOf="@+id/sdv_user_badge" + app:layout_constraintTop_toTopOf="parent" + tools:text="用户名" /> + + + android:visibility="gone" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="@id/sdv_user_badge" + app:layout_constraintLeft_toRightOf="@id/sdv_user_badge" + app:layout_constraintRight_toLeftOf="@+id/badge" + app:layout_constraintTop_toTopOf="@id/sdv_user_badge" + tools:text="答题先锋" /> + - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="@id/tv_badge_name" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/rating_item.xml b/app/src/main/res/layout/rating_item.xml index df8384e61a..d894e5b3b3 100644 --- a/app/src/main/res/layout/rating_item.xml +++ b/app/src/main/res/layout/rating_item.xml @@ -1,433 +1,425 @@ - + - + - - - + - - - + android:orientation="vertical"> + + + + + + + + + + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginLeft="40dp" + android:layout_weight="1" + android:orientation="vertical"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - + android:layout_marginTop="5dp" + android:gravity="center_vertical" + android:orientation="horizontal"> - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + android:orientation="horizontal"> - + - + + - + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + - - - - diff --git a/app/src/main/res/layout/rating_reply_head_item.xml b/app/src/main/res/layout/rating_reply_head_item.xml index 3e947d72b9..e73470d4d2 100644 --- a/app/src/main/res/layout/rating_reply_head_item.xml +++ b/app/src/main/res/layout/rating_reply_head_item.xml @@ -1,100 +1,87 @@ - + - + - - + + + + android:layout_marginRight="16dp" + android:layout_weight="1" + android:orientation="vertical"> - - - - - - - - - - - - - + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + - - + android:layout_alignBottom="@id/game_name" + android:layout_centerVertical="true" + android:layout_marginBottom="2dp" + android:maxLines="1" + android:paddingLeft="3dp" + android:paddingRight="3dp" + android:paddingBottom="0.5dp" + android:textColor="@android:color/white" + android:textSize="9sp" + android:visibility="gone" /> + + android:id="@+id/game_info" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="7dp" + android:textColor="@color/hint" + android:textSize="11sp" /> + - + + + + diff --git a/app/src/main/res/layout/rating_reply_item.xml b/app/src/main/res/layout/rating_reply_item.xml index 949e184418..2a789e7acd 100644 --- a/app/src/main/res/layout/rating_reply_item.xml +++ b/app/src/main/res/layout/rating_reply_item.xml @@ -1,181 +1,147 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> - - - - - - - - - - - - - - + android:background="@android:color/white" + android:paddingLeft="11dp" + android:paddingRight="20dp"> - + + + + + + + + + + + + + + android:layout_marginLeft="9dp" + android:lineSpacingExtra="4dp" + android:textColor="@color/text_3a3a3a" + android:textSize="13sp" + app:layout_constraintTop_toBottomOf="@+id/user_icon" + tools:text="每个评论的正文，最多显示4行，超过则使用省略号…全部，点击[全部]即可展开余下全文" /> - + - + - - + - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/reuse_loading.xml b/app/src/main/res/layout/reuse_loading.xml index 572d37cf12..f75775d4c3 100644 --- a/app/src/main/res/layout/reuse_loading.xml +++ b/app/src/main/res/layout/reuse_loading.xml @@ -1,19 +1,16 @@ - + - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/reuse_no_connection.xml b/app/src/main/res/layout/reuse_no_connection.xml index 2b35613b7f..30bbe14add 100644 --- a/app/src/main/res/layout/reuse_no_connection.xml +++ b/app/src/main/res/layout/reuse_no_connection.xml @@ -1,37 +1,34 @@ - + - + + + android:text="@string/loading_network_error" + android:textColor="@color/c7c7c7" + android:textSize="15sp" /> - + - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/reuse_nodata_skip.xml b/app/src/main/res/layout/reuse_nodata_skip.xml index 50384cb928..c641fac583 100644 --- a/app/src/main/res/layout/reuse_nodata_skip.xml +++ b/app/src/main/res/layout/reuse_nodata_skip.xml @@ -1,32 +1,29 @@ - + - + android:text="@string/game_none" + android:textColor="@color/btn_pause" + android:textSize="15sp" /> - + - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/reuse_toolbar.xml b/app/src/main/res/layout/reuse_toolbar.xml index 762613a4aa..b93500986b 100644 --- a/app/src/main/res/layout/reuse_toolbar.xml +++ b/app/src/main/res/layout/reuse_toolbar.xml @@ -1,116 +1,113 @@ - + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/normal_toolbar_container" + android:layout_width="match_parent" + android:layout_height="@dimen/appbar_height"> - + android:layout_height="match_parent" + app:contentInsetEnd="0dp" + app:contentInsetStartWithNavigation="0dp" + app:navigationIcon="@null"> - + android:orientation="horizontal"> + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/search_default_hot_item.xml b/app/src/main/res/layout/search_default_hot_item.xml index 165506131d..6b6c8f1b24 100644 --- a/app/src/main/res/layout/search_default_hot_item.xml +++ b/app/src/main/res/layout/search_default_hot_item.xml @@ -1,67 +1,54 @@ - + - + - + - - - - - + android:layout_marginLeft="8dp" + android:ellipsize="end" + android:maxLines="1" + android:textSize="12sp" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="@+id/icon" + app:layout_constraintEnd_toStartOf="@+id/labelIv" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/icon" + app:layout_constraintTop_toTopOf="@+id/icon" /> - + - - - - - - - - + diff --git a/app/src/main/res/layout/search_game_footer.xml b/app/src/main/res/layout/search_game_footer.xml index 0ec499bc9c..19384a63bd 100644 --- a/app/src/main/res/layout/search_game_footer.xml +++ b/app/src/main/res/layout/search_game_footer.xml @@ -1,53 +1,51 @@ - + - + + + android:layout_marginTop="15dp" + android:gravity="center" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + android:text="求游戏" + android:textColor="@android:color/white" + android:textSize="14sp" /> - + + + - - - - - - diff --git a/app/src/main/res/layout/search_game_horizontal_item.xml b/app/src/main/res/layout/search_game_horizontal_item.xml deleted file mode 100644 index 3212c5aa8c..0000000000 --- a/app/src/main/res/layout/search_game_horizontal_item.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/search_game_index_item.xml b/app/src/main/res/layout/search_game_index_item.xml index 23bf30cfcc..5778505776 100644 --- a/app/src/main/res/layout/search_game_index_item.xml +++ b/app/src/main/res/layout/search_game_index_item.xml @@ -1,50 +1,39 @@ - + - - + - - + - + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingBottom="16dp" /> - - - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/search_subject_item.xml b/app/src/main/res/layout/search_subject_item.xml index 99761afc25..8effa1127d 100644 --- a/app/src/main/res/layout/search_subject_item.xml +++ b/app/src/main/res/layout/search_subject_item.xml @@ -1,67 +1,65 @@ - - + + + + + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="16dp" + android:paddingTop="16dp" + android:paddingRight="21dp"> - - - + android:includeFontPadding="false" + android:textColor="@color/text_title" + android:textSize="16sp" + android:textStyle="bold" + tools:text="人气手游风向标" /> - - - - - - - - + - \ No newline at end of file + + + + + diff --git a/app/src/main/res/layout/set_wait_dialog.xml b/app/src/main/res/layout/set_wait_dialog.xml index 022d9cf07b..47515a9f7b 100644 --- a/app/src/main/res/layout/set_wait_dialog.xml +++ b/app/src/main/res/layout/set_wait_dialog.xml @@ -1,29 +1,27 @@ + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp"> diff --git a/app/src/main/res/layout/stairs_comment_item.xml b/app/src/main/res/layout/stairs_comment_item.xml index 147e619d2c..e3c013412c 100644 --- a/app/src/main/res/layout/stairs_comment_item.xml +++ b/app/src/main/res/layout/stairs_comment_item.xml @@ -1,208 +1,205 @@ - + - + android:layout_marginLeft="8.5dp"> + + + android:layout_alignTop="@id/comment_user_icon" + android:layout_marginLeft="2.5dp" + android:layout_toRightOf="@+id/comment_user_icon"> - - - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginRight="4dp" + android:layout_toLeftOf="@id/command_container"> - - - + android:textSize="13sp" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/comment_author" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="孙一峰" /> + + + + + + - - + android:layout_alignParentRight="true" + android:layout_marginRight="4dp" + android:orientation="vertical"> - - - - + android:id="@+id/comment_like_container" + android:layout_width="40dp" + android:layout_height="40dp" + android:gravity="center" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingTop="4dp" + android:paddingRight="10dp" + android:paddingBottom="4dp"> + + + android:includeFontPadding="false" + android:textColor="@color/text_subtitle" + android:textSize="12sp" + tools:text="20" /> + + + + + + - - \ No newline at end of file + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/sub_catalog_item.xml b/app/src/main/res/layout/sub_catalog_item.xml index c3a65d15a8..3318ddb489 100644 --- a/app/src/main/res/layout/sub_catalog_item.xml +++ b/app/src/main/res/layout/sub_catalog_item.xml @@ -1,63 +1,51 @@ - + - - - + - + - + - - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/sub_category_item.xml b/app/src/main/res/layout/sub_category_item.xml index 15c532c507..26986d676d 100644 --- a/app/src/main/res/layout/sub_category_item.xml +++ b/app/src/main/res/layout/sub_category_item.xml @@ -1,46 +1,37 @@ - + - - - - + - + - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/task_bottom_item.xml b/app/src/main/res/layout/task_bottom_item.xml index aa9beac9b4..1a846cf3c5 100644 --- a/app/src/main/res/layout/task_bottom_item.xml +++ b/app/src/main/res/layout/task_bottom_item.xml @@ -1,10 +1,7 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/task_title_item.xml b/app/src/main/res/layout/task_title_item.xml index f4418f6168..4b46898e74 100644 --- a/app/src/main/res/layout/task_title_item.xml +++ b/app/src/main/res/layout/task_title_item.xml @@ -1,23 +1,21 @@ - - + + + android:layout_height="35dp" + android:layout_marginTop="12dp" + android:background="@drawable/bg_task_top" /> - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/app/src/main/res/layout/user_history_item.xml b/app/src/main/res/layout/user_history_item.xml index 5b27167e5a..4f7df0d30a 100644 --- a/app/src/main/res/layout/user_history_item.xml +++ b/app/src/main/res/layout/user_history_item.xml @@ -1,325 +1,297 @@ - - - - - - - - - - - - + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:background="@color/white" + android:paddingLeft="11dp" + android:paddingRight="20dp" + app:layout_constraintLeft_toLeftOf="parent" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + app:layout_constraintTop_toTopOf="@id/user_icon" /> + app:layout_constraintBottom_toBottomOf="@id/user_icon" + app:layout_constraintLeft_toRightOf="@id/user_icon" + app:layout_constraintTop_toBottomOf="@id/user_name"> - - - - - - - - - - - - - - - - + android:alpha="0.6" + android:includeFontPadding="false" + android:text="关注的人" + android:textColor="@color/theme_font" + android:textSize="11sp" + android:visibility="gone" /> + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/user_home_amway_item.xml b/app/src/main/res/layout/user_home_amway_item.xml deleted file mode 100644 index 997c1b2f3d..0000000000 --- a/app/src/main/res/layout/user_home_amway_item.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/user_search_list_item.xml b/app/src/main/res/layout/user_search_list_item.xml index 68814a3843..9a94cb3d68 100644 --- a/app/src/main/res/layout/user_search_list_item.xml +++ b/app/src/main/res/layout/user_search_list_item.xml @@ -1,147 +1,124 @@ - + - - + - - + - + android:layout_marginLeft="12dp" + android:ellipsize="end" + android:maxLength="12" + android:maxLines="1" + android:textColor="@color/text_title" + app:layout_constrainedWidth="true" + app:layout_constraintBottom_toTopOf="@+id/userSignatureTv" + app:layout_constraintEnd_toStartOf="@+id/user_badge_icon" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/userAvatar" + app:layout_constraintTop_toTopOf="@+id/userAvatar" + tools:text="我的名字很长我的名字很长我的名字很长" /> + - + - + - + - + - + - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml index 84ba2b001c..177c96f61e 100644 --- a/app/src/main/res/layout/video_item.xml +++ b/app/src/main/res/layout/video_item.xml @@ -1,49 +1,47 @@ - + - + + + + android:layout_marginLeft="8dp" + android:layout_marginBottom="8dp" + android:src="@drawable/ic_user_history_video_like" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintLeft_toLeftOf="parent" /> - + + - - - - - - diff --git a/app/src/main/res/layout/video_label_item.xml b/app/src/main/res/layout/video_label_item.xml index c529c35453..2eacc17561 100644 --- a/app/src/main/res/layout/video_label_item.xml +++ b/app/src/main/res/layout/video_label_item.xml @@ -1,64 +1,54 @@ - + - - - - - - + android:layout_marginRight="16dp" + android:drawableLeft="@drawable/ic_choose_activity" + android:drawablePadding="8dp" + android:ellipsize="end" + android:lineSpacingExtra="8dp" + android:maxLines="1" + android:textColor="@color/text_title" + android:textSize="16sp" + app:layout_constraintEnd_toStartOf="@+id/selectedIv" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="发现好游戏计划" /> - + - - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/video_new_item.xml b/app/src/main/res/layout/video_new_item.xml index d9ff190140..8addef4ee3 100644 --- a/app/src/main/res/layout/video_new_item.xml +++ b/app/src/main/res/layout/video_new_item.xml @@ -1,176 +1,157 @@ - + - - - - - - - - - - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + + + - - - - - - - - - - - - - - - - - - - - + app:layout_constraintStart_toStartOf="parent"> + + + + + app:layout_constraintTop_toTopOf="@+id/video_comment_count" /> - + + + + + + + + + + + diff --git a/app/src/main/res/layout/video_poster_preview_item.xml b/app/src/main/res/layout/video_poster_preview_item.xml index e474ce0001..4b3a243c4a 100644 --- a/app/src/main/res/layout/video_poster_preview_item.xml +++ b/app/src/main/res/layout/video_poster_preview_item.xml @@ -1,42 +1,39 @@ - + - + android:layout_height="60dp" + app:cardCornerRadius="3dp" + app:cardElevation="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent"> - - - - - - - - - + + + + + diff --git a/app/src/main/res/layout/video_status_item.xml b/app/src/main/res/layout/video_status_item.xml index a4b868c381..144f9335dd 100644 --- a/app/src/main/res/layout/video_status_item.xml +++ b/app/src/main/res/layout/video_status_item.xml @@ -1,32 +1,30 @@ - + - + + + + android:layout_marginTop="4dp" + android:layout_marginRight="4dp" + android:background="@drawable/video_insert_status_background" + android:includeFontPadding="false" + android:paddingLeft="6dp" + android:paddingTop="4dp" + android:paddingRight="6dp" + android:paddingBottom="4dp" + android:textSize="11sp" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - + - - - - - diff --git a/app/src/main/res/layout/video_verify_item.xml b/app/src/main/res/layout/video_verify_item.xml index bff41fcf4a..4894d8127b 100644 --- a/app/src/main/res/layout/video_verify_item.xml +++ b/app/src/main/res/layout/video_verify_item.xml @@ -1,70 +1,68 @@ - + - + + + android:layout_marginLeft="8dp" + android:ellipsize="end" + android:lineSpacingExtra="4dp" + android:maxLines="2" + android:minLines="2" + android:textColor="@color/text_title" + android:textSize="13sp" + app:layout_constraintBottom_toTopOf="@id/video_status" + app:layout_constraintLeft_toRightOf="@id/video_cover" + app:layout_constraintRight_toLeftOf="@id/more" + app:layout_constraintTop_toTopOf="@id/video_cover" + app:layout_constraintVertical_chainStyle="packed" + tools:text="元气骑士真好玩！元气骑士真好玩！元气骑士真好玩！元气骑士真好玩！" /> - + - + - + - - - - diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index f705539dba..32cc39dcd2 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -224,4 +224,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 4cf9deb551..b709a98174 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -94,7 +94,7 @@ diff --git a/dependencies.gradle b/dependencies.gradle index 7e5c1e679a..8abb183491 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 490 - versionName = "5.7.0" + versionCode = 510 + versionName = "5.8.0" applicationId = "com.gh.gamecenter" // AndroidX