From 590c1cff46b105d774271f950caa9f65523f05c1 Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期五, 29 十二月 2023 20:20:40 +0800
Subject: [PATCH] 1、增加护眼模式主题\n2、修复显示问题
---
app/src/main/res/layout/activity_family_assets.xml | 2
app/src/main/res/layout/pop_personal_notepad.xml | 2
app/src/main/res/drawable-xhdpi/ic_audio_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor_night.png | 0
app/src/main/res/layout/activity_basic_info.xml | 2
app/src/main/res/menu/bottom_nav_menu.xml | 15
app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java | 24
app/src/main/res/drawable-xxxhdpi/ic_wx_login.png | 0
app/src/main/res/drawable-xxxhdpi/ic_pdf_night.png | 0
app/src/main/res/layout/item_growth_experience_holder_condition.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_property.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/personal_center/PersonalCenterFragment.java | 63 +
app/src/main/res/layout/activity_clean_storage.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/function/VideoCarouselFragment.java | 4
app/src/main/res/layout/activity_annual_health_status.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_tour_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet.png | 0
app/src/main/res/drawable-xhdpi/ic_function_growth.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_privacy.png | 0
app/src/main/res/drawable-xxhdpi/ic_img_night.png | 0
app/src/main/res/drawable/selector_bottom_navigation_text_color.xml | 2
app/src/main/res/layout/activity_main.xml | 4
app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java | 14
app/src/main/res/drawable-xhdpi/ic_function_asset.png | 0
app/src/main/res/drawable-xhdpi/ic_tree_selected.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_honor.png | 0
app/src/main/res/drawable-xhdpi/ic_function_growth_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java | 23
app/src/main/res/drawable-xxxhdpi/function_family_root_net.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyAssetsRvAdapter.java | 23
app/src/main/res/layout/item_personal_notepad.xml | 4
app/src/main/res/drawable-xxxhdpi/ic_function_property.png | 0
app/src/main/res/layout/item_family_member.xml | 21
app/src/main/java/com/application/zhangshi_app_android/adapter/MemoRvAdapter.java | 15
app/src/main/res/drawable-xxxhdpi/ic_flower_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_fold_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_growth_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_tree_default.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_health.png | 0
app/src/main/res/drawable-xxhdpi/ic_zip_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_mail_list.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_certificate_night.png | 0
app/src/main/res/drawable-xhdpi/ic_checked_night.png | 0
app/src/main/res/layout/activity_login.xml | 5
app/src/main/res/drawable-xxxhdpi/ic_function_privacy_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_mail_list.png | 0
app_base/src/main/java/com/android/app_base/manager/AppManager.java | 21
app/src/main/res/drawable-xxhdpi/ic_function_cleaning.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_cleaning_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_notes.png | 0
app/src/main/res/drawable-xxxhdpi/ic_personal_center_default.png | 0
app/src/main/res/drawable-xhdpi/ic_function_cleaning_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_family_root_net_night.png | 0
app/src/main/res/values/themes.xml | 174 +++
app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java | 10
app/src/main/res/drawable-xhdpi/ic_function_honor_night.png | 0
app/src/main/res/values/colors.xml | 39
app/src/main/res/drawable-xhdpi/ic_txt_night.png | 0
app/src/main/res/drawable-xhdpi/ic_fold_night.png | 0
app/src/main/res/layout/activity_little_doctor_detail.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java | 7
app/src/main/res/drawable-xxhdpi/ic_function_family_root_net_night.png | 0
app/src/main/res/layout/activity_tourism_experience.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_cleaning_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAdapter.java | 43
app/src/main/res/layout/item_contacts.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_ppt_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_pamper_pet.png | 0
app/src/main/res/values/attrs.xml | 61 +
app/src/main/res/layout/item_family_assets.xml | 4
app/src/main/res/drawable-xxhdpi/ic_function_tour_night.png | 0
app/src/main/res/layout/item_family_memorabilia.xml | 6
app/src/main/res/drawable-xxhdpi/ic_function_health.png | 0
app/src/main/res/layout/activity_tourism.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_home_selected.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/BrowserActivity.java | 6
app/src/main/res/drawable-xxhdpi/ic_vector_green.png | 0
app/src/main/res/drawable-xxxhdpi/ic_audio_night.png | 0
app/src/main/res/drawable/shape_gradient_tree_myself.xml | 12
app/src/main/res/drawable-xxxhdpi/ic_function_home_devices_night.png | 0
app/src/main/res/layout/activity_honor_collection_detail.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_checked_night.png | 0
app/src/main/res/layout/item_electronic_file_add.xml | 13
app/src/main/res/drawable-xhdpi/ic_function_home_devices.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_health_night.png | 0
app/src/main/res/layout/activity_little_doctor.xml | 2
app/src/main/res/drawable/selector_bottom_navigation_personal_center_night.xml | 8
app/src/main/res/layout/pop_operate_delete.xml | 4
app/src/main/res/drawable-xhdpi/ic_function_income_expense_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_cleaning.png | 0
app/src/main/res/drawable-xxhdpi/ic_txt_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_wish.png | 0
app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected_night.png | 0
app/src/main/res/layout/activity_family_assets_detail.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java | 2
app/src/main/res/drawable-xxhdpi/ic_function_certificate.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_income_expense.png | 0
app/src/main/res/drawable-xxhdpi/ic_fold_night.png | 0
app/src/main/res/layout/item_income_and_expenses.xml | 6
app/src/main/java/com/application/zhangshi_app_android/adapter/PersonalNotepadRvAdapter.java | 23
app/src/main/java/com/application/zhangshi_app_android/other/MyTitleBarStyle.java | 7
app/src/main/res/drawable-xhdpi/ic_flower_night.png | 0
app/src/main/res/layout/activity_marriage.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_little_doctor.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_notes_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_asset.png | 0
app_base/src/main/res/values/arrts.xml | 8
app/src/main/res/drawable-xxxhdpi/ic_function_growth.png | 0
app/src/main/res/layout/activity_privacy_detail.xml | 2
app/build.gradle | 4
app/src/main/java/com/application/zhangshi_app_android/adapter/PropertyRvAdapter.java | 23
app/src/main/res/layout/activity_pet_memo_detail.xml | 2
app/src/main/res/drawable-xhdpi/ic_function_certificate_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_checked_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_marriage.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_cleaning.png | 0
app/src/main/res/drawable/selector_bottom_navigation_tree.xml | 8
app/src/main/res/layout/activity_contacts_import.xml | 2
app/src/main/res/layout/activity_image_select.xml | 2
app/src/main/res/drawable-xxhdpi/ic_word_night.png | 0
app/src/main/res/drawable-xhdpi/ic_ppt_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_income_expense.png | 0
app/src/main/res/layout/activity_hundred_wish_detail.xml | 2
app/src/main/res/drawable-xhdpi/ic_function_notes.png | 0
app/src/main/res/layout/activity_personal_notepad_detail.xml | 2
app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java | 23
app_base/src/main/java/com/android/app_base/widget/SwitchButton.java | 536 ++++++++++++
app/src/main/res/drawable-xxhdpi/ic_function_tour.png | 0
app/src/main/res/drawable-xhdpi/ic_function_health_night.png | 0
app/src/main/res/layout/activity_privacy.xml | 4
app/src/main/res/drawable-xxhdpi/ic_function_privacy_night.png | 0
app/src/main/res/layout/activity_honor_collection.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_family_root_net_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java | 23
app/src/main/res/drawable-xxhdpi/ic_function_home_devices.png | 0
app/src/main/res/drawable-xhdpi/ic_function_privacy.png | 0
app/src/main/res/drawable-xhdpi/ic_tree_default.png | 0
app/src/main/res/layout/activity_contacts.xml | 2
app/src/main/res/drawable-xhdpi/ic_pdf_night.png | 0
app/src/main/res/drawable/selector_checkbox_night.xml | 11
app/src/main/res/drawable-xxxhdpi/ic_function_marriage.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_honor_night.png | 0
app/src/main/res/layout/activity_certificate_of_honor.xml | 2
app/src/main/res/layout/activity_examination_info_detail.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_asset_night.png | 0
app/src/main/res/layout/item_clean_storage.xml | 6
app/src/main/java/com/application/zhangshi_app_android/ui/main/MainViewModel.java | 1
app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected.png | 0
app/src/main/AndroidManifest.xml | 2
app/src/main/res/drawable-xxhdpi/ic_others_night.png | 0
app/src/main/res/layout/item_pet.xml | 4
app/src/main/res/drawable-xxxhdpi/ic_function_selected.png | 0
app/src/main/res/drawable-xxxhdpi/ic_vector_green.png | 0
app/src/main/res/drawable-xhdpi/ic_video_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_unfold_night.png | 0
app/src/main/res/drawable-xhdpi/ic_img_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_property.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_wish_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_marriage_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_tour.png | 0
app/src/main/res/drawable-xxhdpi/ic_excel_night.png | 0
app/src/main/res/layout/fragment_function.xml | 60
app/src/main/res/drawable-xxxhdpi/ic_img_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_little_doctor_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_notes.png | 0
app/src/main/res/drawable-xxhdpi/ic_myself.png | 0
app/src/main/res/drawable-xhdpi/ic_function_privacy_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_mail_list_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_honor.png | 0
app/src/main/res/layout/activity_health_care.xml | 2
app/src/main/res/drawable-xhdpi/ic_function_home_devices_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_tree_default.png | 0
app/src/main/res/drawable-xhdpi/ic_zip_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_home_devices_night.png | 0
app/src/main/res/layout/activity_property.xml | 4
app/src/main/res/drawable-xxhdpi/ic_ppt_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_tree_selected.png | 0
app/src/main/res/layout/item_privacy.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java | 45
app/src/main/res/drawable-xhdpi/ic_function_certificate.png | 0
app/src/main/res/drawable-xhdpi/ic_function_asset_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/HundredWishRvAdapter.java | 23
app/src/main/res/values/strings.xml | 3
app/src/main/res/drawable-xhdpi/ic_vector_green.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_growth.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 26
app/src/main/res/drawable-xxhdpi/ic_pdf_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor.png | 0
app/src/main/res/drawable-xhdpi/ic_function_notes_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java | 14
app/src/main/res/drawable-xxhdpi/ic_flower_night.png | 0
app/src/main/res/layout/activity_login_bg_change.xml | 2
app/src/main/res/drawable-xhdpi/ic_home_selected_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java | 52
app/src/main/res/drawable-xxhdpi/ic_function_mail_list_night.png | 0
app/src/main/res/layout/item_growth_experience_abroad_condition.xml | 2
app/src/main/res/drawable-xhdpi/ic_myself.png | 0
app/src/main/res/drawable-xhdpi/ic_function_wish_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_home_selected_night.png | 0
app/src/main/res/layout/item_tourism.xml | 4
app/src/main/res/drawable-xxhdpi/ic_video_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_pamper_pet_night.png | 0
app_base/src/main/java/com/android/app_base/http/interceptor/AuthInterceptor.java | 2
app/src/main/res/values/styles.xml | 4
app/src/main/java/com/application/zhangshi_app_android/bean/UpdateVersionBean.java | 10
app/src/main/res/drawable-xxxhdpi/ic_function_privacy.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_tour.png | 0
app/src/main/res/layout/item_home_devices.xml | 6
app/src/main/res/drawable-xxxhdpi/ic_function_health_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_marriage_night.png | 0
app/src/main/res/layout/activity_clean_storage_detail.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_property_night.png | 0
app/src/main/res/layout/activity_family_memorabilia.xml | 2
app/src/main/res/layout/pop_operate_exam_info.xml | 2
app/src/main/res/layout/pop_contacts_import.xml | 2
app/src/main/res/layout/activity_examination_info.xml | 2
app/src/main/res/drawable/ic_function_family_root_net.xml | 12
app/src/main/res/layout/pop_operate_person_center.xml | 2
app/src/main/res/drawable-xhdpi/ic_unfold_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/HomeDevicesRvAdapter.java | 23
app/src/main/res/drawable-xhdpi/ic_others_night.png | 0
app/src/main/res/layout/item_honor_collection.xml | 4
app/src/main/java/com/application/zhangshi_app_android/MyApplication.java | 7
app/src/main/res/layout/item_growth_experience_relationship.xml | 2
app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java | 23
app/src/main/res/layout/dialog_toatal_add.xml | 14
.idea/deploymentTargetDropDown.xml | 2
app/src/main/res/layout/fragment_home.xml | 75 +
app/src/main/res/layout/activity_home_devices_detail.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_property_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_wish.png | 0
app_base/src/main/java/com/android/app_base/utils/Utils.java | 43 +
app/src/main/res/drawable-xxxhdpi/ic_zip_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java | 4
app/src/main/res/drawable-xhdpi/ic_excel_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java | 23
app/src/main/res/layout/item_annual_health_status.xml | 4
app/src/main/res/layout/item_tourism_experience.xml | 4
app/src/main/res/drawable-xhdpi/ic_function_marriage.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_marriage_night.png | 0
app/src/main/res/layout/activity_property_detail.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet_night.png | 0
app/src/main/res/drawable/selector_bottom_navigation_function_night.xml | 8
app/src/main/res/layout/acitivity_tourism_experience_detail.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_growth_night.png | 0
app/src/main/res/layout/pop_operate_pet.xml | 2
app/src/main/res/layout/pop_annual_health_status.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet.png | 0
app/src/main/java/com/application/zhangshi_app_android/widget/Node.java | 6
app/src/main/res/layout/item_property.xml | 2
app/src/main/res/layout/activity_personal_notepad.xml | 2
app/src/main/res/layout/pop_operate_home_root_net.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_honor_night.png | 0
app/src/main/res/layout/activity_genealogy.xml | 2
app/src/main/res/layout/item_home_member_list.xml | 2
app/src/main/res/layout/activity_pet_detail.xml | 2
app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeFragment.java | 17
app/src/main/res/drawable-xxxhdpi/ic_unfold_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_honor.png | 0
app/src/main/res/drawable-xxxhdpi/ic_home_selected_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_others_night.png | 0
app/src/main/res/layout/activity_tourism_detail.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_wish_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java | 20
app/src/main/res/drawable-xxxhdpi/ic_excel_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_video_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java | 23
app/src/main/res/layout/activity_growth_experience.xml | 4
app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java | 23
app/src/main/res/drawable-xhdpi/ic_personal_center_selected_night.png | 0
app/src/main/res/layout/activity_annual_health_status_detail.xml | 2
app/src/main/res/layout/item_pet_memo.xml | 2
app/src/main/res/drawable-xhdpi/ic_function_property_night.png | 0
app/src/main/res/layout/activity_family_memorabilia_detail.xml | 2
app/src/main/res/drawable-xhdpi/ic_function_health.png | 0
app/src/main/res/layout/layout_drawer.xml | 137 +-
app/src/main/res/drawable/selector_bottom_navigation_home_night.xml | 8
app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java | 31
app/src/main/java/com/application/zhangshi_app_android/adapter/CertificateOfHonorRvAdapter.java | 23
app/src/main/res/drawable-xxxhdpi/ic_function_income_expense_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_asset_night.png | 0
app/src/main/res/layout/activity_pet.xml | 2
app/src/main/res/drawable-xxxhdpi/bg_login_zhang.png | 0
app/src/main/res/drawable-xxxhdpi/ic_word_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java | 14
app/src/main/res/layout/item_hundred_wish.xml | 2
app/src/main/res/layout/item_growth_experience_primary.xml | 2
app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java | 3
app/src/main/java/com/application/zhangshi_app_android/adapter/TourismExperienceRvAdapter.java | 14
app/src/main/res/layout/fragment_personal_center.xml | 29
app/src/main/res/layout/activity_certificate_of_honor_detail.xml | 2
app/src/main/res/drawable-xxhdpi/ic_function_wish.png | 0
app/src/main/res/drawable-xxxhdpi/ic_home_default.png | 0
app/src/main/res/layout/item_examination_info.xml | 4
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java | 17
app/src/main/res/drawable-xxhdpi/ic_function_little_doctor_night.png | 0
app/src/main/res/drawable-xhdpi/ic_function_little_doctor.png | 0
app/src/main/res/drawable-xxhdpi/ic_personal_center_selected_night.png | 0
app/src/main/res/layout/pop_operate.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_certificate.png | 0
app/src/main/res/layout/item_little_doctor.xml | 6
app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java | 23
app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java | 23
app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java | 23
app/src/main/res/drawable-xxxhdpi/ic_function_notes_night.png | 0
app/src/main/res/layout/activity_home_devices.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_function_certificate_night.png | 0
app/src/main/res/layout/activity_income_and_expenses_detail.xml | 2
app_base/src/main/java/com/android/app_base/manager/UserManager.java | 20
app/src/main/java/com/application/zhangshi_app_android/adapter/ExaminationInfoRvAdapter.java | 23
app/src/main/res/drawable-xxxhdpi/ic_myself.png | 0
app/src/main/res/drawable-xhdpi/ic_function_tour_night.png | 0
app/src/main/res/layout/pop_switch_video_or_image.xml | 2
/dev/null | 109 --
app/src/main/res/drawable-xxhdpi/ic_function_asset.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_income_expense_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_home_devices.png | 0
app/src/main/res/layout/item_certificate_of_honor.xml | 2
app/src/main/res/drawable-xxxhdpi/ic_txt_night.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_mail_list_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_function_income_expense.png | 0
app/src/main/res/layout/activity_income_and_expenses.xml | 2
app/src/main/res/drawable-xhdpi/ic_word_night.png | 0
app/src/main/res/drawable-xxhdpi/ic_audio_night.png | 0
app/src/main/java/com/application/zhangshi_app_android/ui/home/TreeFragment.java | 10
app/src/main/res/drawable-xxxhdpi/bg_login_home.png | 0
app/src/main/res/drawable-xxxhdpi/ic_tree_selected.png | 0
app/src/main/res/drawable-xxxhdpi/ic_function_default.png | 0
app/src/main/java/com/application/zhangshi_app_android/adapter/IncomeAndExpensesRvAdapter.java | 23
330 files changed, 1,957 insertions(+), 611 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index f1ef53d..176ef9e 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,6 +12,6 @@
</deviceKey>
</Target>
</targetSelectedWithDropDown>
- <timeTargetWasSelectedWithDropDown value="2023-10-25T11:40:17.439780100Z" />
+ <timeTargetWasSelectedWithDropDown value="2023-12-11T10:41:49.189704100Z" />
</component>
</project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 917df11..794de4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@
applicationId "com.application.zhangshi_app_android"
minSdk 24
targetSdk 33
- versionCode 3
- versionName "1.0.2"
+ versionCode 5
+ versionName "1.0.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
ndk {
//APP鐨刡uild.gradle璁剧疆鏀寔鐨凷O搴撴灦鏋�
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4e682ce..c4debca 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
android:networkSecurityConfig="@xml/network_security_config"
android:resizeableActivity="true"
android:supportsRtl="true"
- android:theme="@style/Theme.app"
+ android:theme="@style/AppTheme.Normal"
android:usesCleartextTraffic="true"
tools:targetApi="31">
diff --git a/app/src/main/java/com/application/zhangshi_app_android/MyApplication.java b/app/src/main/java/com/application/zhangshi_app_android/MyApplication.java
index e18d00c..5bbc34c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/MyApplication.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/MyApplication.java
@@ -1,23 +1,18 @@
package com.application.zhangshi_app_android;
import com.android.app_base.base.BaseApplication;
-import com.android.app_base.base.BaseConfig;
-import com.android.app_base.http.OkHttpHelper;
import com.application.zhangshi_app_android.other.MyTitleBarStyle;
import com.github.gzuliyujiang.dialog.DialogColor;
import com.github.gzuliyujiang.dialog.DialogConfig;
import com.github.gzuliyujiang.dialog.DialogStyle;
import com.hjq.bar.TitleBar;
-import com.hjq.http.EasyConfig;
-import com.hjq.http.config.IRequestHandler;
-import com.hjq.http.config.RequestServer;
//import me.jessyan.autosize.AutoSizeConfig;
/**
* @author Ljj
* @date 2023.03.02. 17:51
- * @desc
+ * @desc 鑷畾涔堿pplication
*/
public class MyApplication extends BaseApplication {
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
index 5b3d298..3c5575e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/AnnualHealthStatusRvAdapter.java
@@ -2,9 +2,8 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
-import android.view.animation.Animation;
-import android.view.animation.Transformation;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -18,16 +17,11 @@
import com.android.app_base.utils.Utils;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
-import com.application.zhangshi_app_android.bean.PersonalNotepadBean;
import com.application.zhangshi_app_android.databinding.ItemAnnualHealthStatusBinding;
import com.application.zhangshi_app_android.ui.function.AnnualHealthStatusActivityViewModel;
import com.application.zhangshi_app_android.ui.function.AnnualHealthStatusDetailActivity;
-import com.application.zhangshi_app_android.ui.function.CleanStorageDetailActivity;
-import com.application.zhangshi_app_android.ui.function.PersonalNotepadActivityViewModel;
-import com.application.zhangshi_app_android.ui.function.PersonalNotepadDetailActivity;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -60,22 +54,33 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
+
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -111,14 +116,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/CertificateOfHonorRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/CertificateOfHonorRvAdapter.java
index 0705436..ff8b69f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/CertificateOfHonorRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/CertificateOfHonorRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -50,23 +51,33 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -79,14 +90,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java
index a7349ef..3d2b23a 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/CleanStorageRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -54,23 +55,33 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -115,14 +126,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
index 48c64a5..6762c39 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ContactsRvAdapter.java
@@ -1,6 +1,7 @@
package com.application.zhangshi_app_android.adapter;
import android.content.Context;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -45,22 +46,33 @@
ContactsDetailAdapter adapter = new ContactsDetailAdapter(mContext);
holder.getBinding().recyclerView.setAdapter(adapter);
adapter.setData(mDataList.get(position).getContactsDetailBeans());
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
index bb848fc..ec8f658 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/DailyConsumeRecordRvAdapter.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
+import android.util.TypedValue;
import android.widget.FrameLayout;
import androidx.lifecycle.LifecycleOwner;
@@ -62,14 +63,19 @@
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -80,14 +86,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
holder.getBinding().cardView.postDelayed(new Runnable() {
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAdapter.java
index bffa07a..b7e0147 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.pm.ActivityInfo;
+import android.util.TypedValue;
import android.view.View;
import com.android.app_base.base.adapter.BaseRVAdapter;
@@ -29,27 +30,31 @@
protected void onBind(BaseViewHolder<ItemElectronicFileBinding> holder, int position) {
String item = mDataList.get(position);
if (item != null) {
- if (item.endsWith(".pdf")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_pdf);
- } else if (item.endsWith(".zip") || item.endsWith(".aar") || item.endsWith(".7z")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_zip);
- } else if (item.endsWith(".doc") || item.endsWith(".docx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_word);
- } else if (item.endsWith(".xls") || item.endsWith(".xlsx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_excel);
- } else if (item.endsWith(".ppt") || item.endsWith(".pptx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_ppt);
- } else if (item.endsWith(".txt")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_txt);
- } else if (item.endsWith(".jpg") || item.endsWith(".jpeg") || item.endsWith(".png") || item.endsWith(".gif")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_img);
- } else if (item.endsWith(".mp4")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_video);
- } else if (item.endsWith(".mp3") || item.endsWith(".m4a")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_audio);
+ int resid;
+ if (item.endsWith(".pdf") || item.endsWith(".PDF")) {
+ resid = R.attr.icPdf;
+ } else if (item.endsWith(".zip") || item.endsWith(".ZIP") || item.endsWith(".aar") || item.endsWith(".AAR") || item.endsWith(".7z")) {
+ resid = R.attr.icZip;
+ } else if (item.endsWith(".doc") || item.endsWith(".docx") || item.endsWith(".DOC") || item.endsWith(".DOCX") || item.endsWith(".wps") || item.endsWith(".WPS")) {
+ resid = R.attr.icWord;
+ } else if (item.endsWith(".xls") || item.endsWith(".xlsx") || item.endsWith(".XLS") || item.endsWith(".XLSX")) {
+ resid = R.attr.icExcel;
+ } else if (item.endsWith(".ppt") || item.endsWith(".PPT") || item.endsWith(".pptx") || item.endsWith(".PPTX")) {
+ resid = R.attr.icPpt;
+ } else if (item.endsWith(".txt") || item.endsWith(".TXT")) {
+ resid = R.attr.icTxt;
+ } else if (item.endsWith(".jpg") || item.endsWith(".JPG") || item.endsWith(".jpeg") || item.endsWith(".JPEG") || item.endsWith(".png") || item.endsWith(".PNG") || item.endsWith(".gif") || item.endsWith(".GIF") || item.endsWith(".bmp") || item.endsWith(".BMP")) {
+ resid = R.attr.icImage;
+ } else if (item.endsWith(".mp4") || item.endsWith(".MP4") ) {
+ resid = R.attr.icVideo;
+ } else if (item.endsWith(".mp3") || item.endsWith(".m4a") || item.endsWith(".MP3") || item.endsWith(".M4A")) {
+ resid = R.attr.icAudio;
} else {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_others);
+ resid = R.attr.icOther;
}
+ TypedValue typedValue = new TypedValue();
+ mContext.getTheme().resolveAttribute(resid, typedValue, true);
+ holder.getBinding().ivImage.setImageResource(typedValue.resourceId);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
index 3f27eeb..adca4c1 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ElectronicFileAddAdapter.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Context;
import android.util.Base64;
+import android.util.TypedValue;
import android.view.View;
import androidx.annotation.Nullable;
@@ -167,20 +168,31 @@
if (item != null) {
//闈炲浘鐗囪棰戯紝鎵撳紑鏂囦欢棰勮
-
- if (item.endsWith(".pdf")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_pdf);
- } else if (item.endsWith(".zip") || item.endsWith(".aar") || item.endsWith(".7z")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_zip);
- } else if (item.endsWith(".doc") || item.endsWith(".docx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_word);
- } else if (item.endsWith(".xls") || item.endsWith(".xlsx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_excel);
- } else if (item.endsWith(".ppt") || item.endsWith(".pptx")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_ppt);
- } else if (item.endsWith(".txt")) {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_txt);
- } else if (item.endsWith(".jpg") || item.endsWith(".jpeg") || item.endsWith(".png") || item.endsWith(".gif")) {
+ if (item.endsWith(".pdf") || item.endsWith(".PDF")) {
+ TypedValue icPdf = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icPdf, icPdf, true);
+ holder.getBinding().ivImage.setImageResource(icPdf.resourceId);
+ } else if (item.endsWith(".zip") || item.endsWith(".ZIP") || item.endsWith(".aar") || item.endsWith(".AAR") || item.endsWith(".7z")) {
+ TypedValue icZip = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icZip, icZip, true);
+ holder.getBinding().ivImage.setImageResource(icZip.resourceId);
+ } else if (item.endsWith(".doc") || item.endsWith(".docx") || item.endsWith(".DOC") || item.endsWith(".DOCX") || item.endsWith(".wps") || item.endsWith(".WPS")) {
+ TypedValue icWord = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icWord, icWord, true);
+ holder.getBinding().ivImage.setImageResource(icWord.resourceId);
+ } else if (item.endsWith(".xls") || item.endsWith(".xlsx") || item.endsWith(".XLS") || item.endsWith(".XLSX")) {
+ TypedValue icExcel = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icExcel, icExcel, true);
+ holder.getBinding().ivImage.setImageResource(icExcel.resourceId);
+ } else if (item.endsWith(".ppt") || item.endsWith(".PPT") || item.endsWith(".pptx") || item.endsWith(".PPTX")) {
+ TypedValue icPpt = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icPpt, icPpt, true);
+ holder.getBinding().ivImage.setImageResource(icPpt.resourceId);
+ } else if (item.endsWith(".txt") || item.endsWith(".TXT")) {
+ TypedValue icTxt = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icTxt, icTxt, true);
+ holder.getBinding().ivImage.setImageResource(icTxt.resourceId);
+ } else if (item.endsWith(".jpg") || item.endsWith(".JPG") || item.endsWith(".jpeg") || item.endsWith(".JPEG") || item.endsWith(".png") || item.endsWith(".PNG") || item.endsWith(".gif") || item.endsWith(".GIF") || item.endsWith(".bmp") || item.endsWith(".BMP")) {
holder.getBinding().setUrl(item);
if (isPreview) {
holder.itemView.setOnClickListener(new View.OnClickListener() {
@@ -190,7 +202,7 @@
}
});
}
- } else if (item.endsWith(".mp4")) {
+ } else if (item.endsWith(".mp4") || item.endsWith(".MP4") ) {
holder.getBinding().flPlay.setVisibility(View.VISIBLE);
holder.getBinding().setUrl(item);
if (isPreview) {
@@ -206,11 +218,15 @@
});
}
- } else if (item.endsWith(".mp3") || item.endsWith(".m4a")) {
+ } else if (item.endsWith(".mp3") || item.endsWith(".m4a") || item.endsWith(".MP3") || item.endsWith(".M4A")) {
// holder.getBinding().flPlay.setVisibility(View.VISIBLE);
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_audio);
+ TypedValue icAudio = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icAudio, icAudio, true);
+ holder.getBinding().ivImage.setImageResource(icAudio.resourceId);
} else {
- holder.getBinding().ivImage.setImageResource(R.drawable.ic_others);
+ TypedValue icOther = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icOther, icOther, true);
+ holder.getBinding().ivImage.setImageResource(icOther.resourceId);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/ExaminationInfoRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/ExaminationInfoRvAdapter.java
index eeb7577..3af721f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/ExaminationInfoRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/ExaminationInfoRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -53,22 +54,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -104,14 +115,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyAssetsRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyAssetsRvAdapter.java
index 46c1e9b..f5e13c3 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyAssetsRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyAssetsRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -52,22 +53,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -85,14 +96,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
index f3c783b..cbcba39 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/FamilyMemorabiliaRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -61,22 +62,32 @@
@Override
protected void onBind(MyViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -122,14 +133,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
index 0fae005..d64fe33 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceAbroadConditionRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -67,14 +68,19 @@
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -87,14 +93,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
index 7fdc6aa..16da178 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceHolderConditionRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -54,22 +55,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -83,14 +94,14 @@
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
expendMap.put(getItem(position),false);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
expendMap.put(getItem(position),true);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
}
}
});
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
index e43d1fe..e543947 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperiencePrimaryRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -54,22 +55,32 @@
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -86,14 +97,14 @@
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
expendMap.put(getItem(position),false);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
expendMap.put(getItem(position),true);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
}
}
});
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
index f2c381d..f26c6ea 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/GrowthExperienceRelationshipRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -67,14 +68,19 @@
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -88,14 +94,14 @@
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
expendMap.put(getItem(position),false);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
expendMap.put(getItem(position),true);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
}
}
});
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeDevicesRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeDevicesRvAdapter.java
index 08b5015..d689b61 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeDevicesRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeDevicesRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -49,22 +50,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -110,14 +121,14 @@
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
expendMap.put(getItem(position),false);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
expendMap.put(getItem(position),true);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
}
}
});
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java
index dbfa7b7..a96f1c4 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HomeMemberAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -38,23 +39,33 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -67,14 +78,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
index 7246b0e..dd9620a 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HonorCollectionRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -44,22 +45,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -77,14 +88,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/HundredWishRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/HundredWishRvAdapter.java
index 01eb0fd..5eb1881 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/HundredWishRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/HundredWishRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -49,22 +50,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -77,14 +88,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/IncomeAndExpensesRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/IncomeAndExpensesRvAdapter.java
index 8d2428c..8745184 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/IncomeAndExpensesRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/IncomeAndExpensesRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -64,22 +65,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -124,14 +135,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
index 16fe352..10cc02e 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/LittleDoctorRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -50,22 +51,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -111,14 +122,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/MemoRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/MemoRvAdapter.java
index 419fab8..9b2dd43 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/MemoRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/MemoRvAdapter.java
@@ -3,6 +3,7 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
+import android.util.TypedValue;
import android.view.View;
import android.widget.FrameLayout;
@@ -57,15 +58,19 @@
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
-
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -78,7 +83,7 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
@@ -88,7 +93,7 @@
holder.getBinding().cardView.measure(widthMeasureSpec, heightMeasureSpec);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PersonalNotepadRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PersonalNotepadRvAdapter.java
index 629d4f3..811c155 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PersonalNotepadRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PersonalNotepadRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -54,22 +55,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -105,14 +116,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
index 1ba24b5..f148bd4 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetMemoRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -51,22 +52,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -79,14 +90,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
index a68c573..11aa6f7 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PetRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import com.android.app_base.base.adapter.BaseRVAdapter;
@@ -33,10 +34,15 @@
@Override
protected void onBind(BaseViewHolder<ItemPetBinding> holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (mDataList.get(position).getOwnData() == 1){
holder.getBinding().ivFlower.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
index 3b6a2c4..1949404 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PrivacyRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -49,22 +50,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -77,14 +88,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/PropertyRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/PropertyRvAdapter.java
index 6f38389..c88c967 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/PropertyRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/PropertyRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -52,22 +53,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -80,14 +91,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismExperienceRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismExperienceRvAdapter.java
index 6b8c8a2..61e284c 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismExperienceRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismExperienceRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.view.animation.Animation;
import android.view.animation.Transformation;
@@ -70,14 +71,19 @@
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -113,14 +119,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
index 070a590..070ea2f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/adapter/TourismRvAdapter.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.content.Intent;
+import android.util.TypedValue;
import android.view.View;
import android.widget.CompoundButton;
import android.widget.FrameLayout;
@@ -60,22 +61,32 @@
@Override
protected void onBind(ViewHolder holder, int position) {
holder.getBinding().setBean(mDataList.get(position));
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍗＄墖鑳屾櫙鑹�
+ TypedValue typedValue1 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorFirst, typedValue1, true);
+ TypedValue typedValue2 = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.cardBackgroundColorSecond, typedValue2, true);
if (position % 2 != 0){
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_blue));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue1.data);
}else {
- holder.getBinding().cardView.setCardBackgroundColor(mContext.getColor(R.color.color_card_pink));
+ holder.getBinding().cardView.setCardBackgroundColor(typedValue2.data);
}
if (!expendMap.containsKey(getItem(position))){
expendMap.put(getItem(position),false);
}
+ //鏍规嵁涓婚閫夋嫨瀵瑰簲鍥炬爣
+ TypedValue unfoldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icUnfold, unfoldIcon, true);
+ TypedValue foldIcon = new TypedValue();
+ mContext.getTheme().resolveAttribute(R.attr.icFold, foldIcon, true);
if (Boolean.TRUE.equals(expendMap.get(getItem(position)))){
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = FrameLayout.LayoutParams.WRAP_CONTENT;
holder.getBinding().cardView.requestLayout();
});
}else{
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
holder.getBinding().cardView.post(() -> {
holder.getBinding().cardView.getLayoutParams().height = holder.getBinding().layoutTitle.getMeasuredHeight();
holder.getBinding().cardView.requestLayout();
@@ -111,14 +122,14 @@
int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
int collapsedHeight = holder.getBinding().layoutTitle.getMeasuredHeight();
Utils.pullCollapse(holder.getBinding().cardView,initialHeight,collapsedHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_fold);
+ holder.getBinding().ivFold.setBackgroundResource(foldIcon.resourceId);
expendMap.put(getItem(position),false);
}else{
final int initialHeight = holder.getBinding().cardView.getMeasuredHeight();
holder.getBinding().cardView.measure(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT);
int targetHeight = holder.getBinding().cardView.getMeasuredHeight();
Utils.dropExpand(holder.getBinding().cardView,initialHeight,targetHeight);
- holder.getBinding().ivFold.setBackgroundResource(R.drawable.ic_unfold);
+ holder.getBinding().ivFold.setBackgroundResource(unfoldIcon.resourceId);
expendMap.put(getItem(position),true);
}
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/bean/UpdateVersionBean.java b/app/src/main/java/com/application/zhangshi_app_android/bean/UpdateVersionBean.java
index 39bbbcb..5102f19 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/bean/UpdateVersionBean.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/bean/UpdateVersionBean.java
@@ -20,6 +20,8 @@
private String publishTime;
// 鏄惁寮哄埗鏇存柊 1鏄� 0鍚�
private int forceUpdate;
+ // MD5
+ private String md5;
public int getVersionCode() {
return versionCode;
@@ -68,4 +70,12 @@
public void setForceUpdate(int forceUpdate) {
this.forceUpdate = forceUpdate;
}
+
+ public String getMd5() {
+ return md5;
+ }
+
+ public void setMd5(String md5) {
+ this.md5 = md5;
+ }
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/other/MyTitleBarStyle.java b/app/src/main/java/com/application/zhangshi_app_android/other/MyTitleBarStyle.java
index 112d96b..5d873b9 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/other/MyTitleBarStyle.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/other/MyTitleBarStyle.java
@@ -6,11 +6,9 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.util.TypedValue;
-import android.widget.TextView;
import androidx.appcompat.content.res.AppCompatResources;
-import com.android.app_base.utils.ScreenSizeUtils;
import com.application.zhangshi_app_android.R;
import com.hjq.bar.style.CommonBarStyle;
@@ -38,7 +36,10 @@
@Override
public Drawable getTitleBarBackground(Context context) {
- return new ColorDrawable(context.getColor(R.color.color_title_bar_background));
+ //鏍规嵁褰撳墠涓婚鑾峰彇涓嶅悓鐨勮儗鏅鑹�
+ TypedValue typedValue = new TypedValue();
+ context.getTheme().resolveAttribute(R.attr.titleBarBackgroundColor, typedValue, true);
+ return new ColorDrawable(typedValue.data);
}
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/BrowserActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/BrowserActivity.java
index ab92389..6a2632f 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/BrowserActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/BrowserActivity.java
@@ -33,13 +33,17 @@
* @date 2023.10.15. 22:36
* @desc 娴忚鍣ㄧ晫闈�
*/
-public class BrowserActivity extends BaseActivity<ActivityBrowserBinding,SimpleViewModel> {
+public class BrowserActivity extends DLBaseActivity<ActivityBrowserBinding,SimpleViewModel> {
private static final String INTENT_URL = "url";
private String url;
private BaseDialog mWaitDialog;
+ @Override
+ protected boolean isDrawerLayoutEnabled() {
+ return false;
+ }
public static void start(Context context, String url) {
if (TextUtils.isEmpty(url)) {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
index c5b1f88..45b1361 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java
@@ -3,6 +3,7 @@
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
@@ -42,7 +43,7 @@
import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
import com.application.zhangshi_app_android.ui.function.PropertyActivity;
import com.application.zhangshi_app_android.ui.function.TourismActivity;
-import com.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
import com.github.gzuliyujiang.wheelpicker.OptionPicker;
@@ -102,12 +103,21 @@
return R.layout.layout_drawer;
};
+
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
+
+ //璁剧疆涓婚
+ if (UserManager.getInstance().getNightModeState()) {
+ setTheme(R.style.AppTheme_Night);
+ } else {
+ setTheme(R.style.AppTheme_Normal);
+ }
+
super.onCreate(savedInstanceState);
if (mDrawerLayout != null) {
- classMap.put(HomeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
+ classMap.put(TreeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
classMap.put(FamilyMemorabiliaActivity.class,(LinearLayout) findViewById(R.id.dl_family_memorabilia));
classMap.put(FamilyAssetsActivity.class,(LinearLayout) findViewById(R.id.dl_family_assets));
classMap.put(HomeDevicesActivity.class,(LinearLayout) findViewById(R.id.dl_home_devices));
@@ -132,8 +142,8 @@
if (linearLayout != null) {
linearLayout.setOnClickListener(v -> {
if (set.getKey() != null){
- if (set.getKey() == HomeFragment.class) {
- MainActivity.start(this, HomeFragment.class);
+ if (set.getKey() == TreeFragment.class) {
+ MainActivity.start(this, TreeFragment.class);
}else{
if(this.getClass() != set.getKey()){
AppManager.getAppManager().startActivity(set.getKey());
@@ -179,8 +189,12 @@
}
TextView textView = (TextView) linearLayout.getChildAt(1);
ImageView imageView = (ImageView) linearLayout.getChildAt(2);
- textView.setTextColor(Color.parseColor("#FFF6739F"));
- imageView.setBackgroundResource(R.drawable.ic_vector_pink);
+ TypedValue textColor = new TypedValue();
+ getTheme().resolveAttribute(R.attr.drawerTextColor, textColor, true);
+ textView.setTextColor(textColor.data);
+ TypedValue icon = new TypedValue();
+ getTheme().resolveAttribute(R.attr.drawerSelectIcon, icon, true);
+ imageView.setBackgroundResource(icon.resourceId);
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
index eb32c4c..8f91ad4 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseFragment.java
@@ -3,6 +3,7 @@
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle;
+import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -43,7 +44,7 @@
import com.application.zhangshi_app_android.ui.function.PrivacyActivity;
import com.application.zhangshi_app_android.ui.function.PropertyActivity;
import com.application.zhangshi_app_android.ui.function.TourismActivity;
-import com.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;
import com.hjq.bar.TitleBar;
@@ -116,7 +117,7 @@
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
if (mDrawerLayout != null) {
- classMap.put(HomeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
+ classMap.put(TreeFragment.class,(LinearLayout) findViewById(R.id.dl_home_root_net));
classMap.put(FamilyMemorabiliaActivity.class,(LinearLayout) findViewById(R.id.dl_family_memorabilia));
classMap.put(FamilyAssetsActivity.class,(LinearLayout) findViewById(R.id.dl_family_assets));
classMap.put(HomeDevicesActivity.class,(LinearLayout) findViewById(R.id.dl_home_devices));
@@ -141,8 +142,8 @@
if (linearLayout != null) {
linearLayout.setOnClickListener(v -> {
if (set.getKey() != null){
- if (set.getKey() == HomeFragment.class) {
- MainActivity.start(getContext(), HomeFragment.class);
+ if (set.getKey() == TreeFragment.class) {
+ MainActivity.start(getContext(), TreeFragment.class);
}else{
AppManager.getAppManager().startActivity(set.getKey());
}
@@ -172,8 +173,12 @@
}
TextView textView = (TextView) linearLayout.getChildAt(1);
ImageView imageView = (ImageView) linearLayout.getChildAt(2);
- textView.setTextColor(Color.parseColor("#FFF6739F"));
- imageView.setBackgroundResource(R.drawable.ic_vector_pink);
+ TypedValue textColor = new TypedValue();
+ getContext().getTheme().resolveAttribute(R.attr.drawerTextColor, textColor, true);
+ textView.setTextColor(textColor.data);
+ TypedValue icon = new TypedValue();
+ getContext().getTheme().resolveAttribute(R.attr.drawerSelectIcon, icon, true);
+ imageView.setBackgroundResource(icon.resourceId);
}
public void setNameAndAvatar(String name,String avatar){
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java
index 90230a2..26eadc1 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/BigImageDialog.java
@@ -9,6 +9,8 @@
import androidx.annotation.DrawableRes;
import androidx.constraintlayout.utils.widget.ImageFilterView;
+
+import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.dialog.BaseDialog;
import com.android.app_base.utils.GlideUtil;
import com.application.zhangshi_app_android.R;
@@ -37,6 +39,11 @@
}
public Builder setBigImage(String url) {
+ if (url.contains("profile/upload")) {//濡傛灉鏄笂浼犲埌鏈嶅姟鍣ㄧ殑鍥剧墖
+ //鍙彇profile/upload浠ュ悗鐨勯儴鍒�
+ url = url.substring(url.indexOf("profile/upload"));
+ url = BaseConfig.BASE_URL_DOMAIN + "/" + url;
+ }
GlideUtil.loadImage(url,iv_big_image);
return this;
}
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java
index 314e963..22bccfa 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/dialog/UpdateDialog.java
@@ -13,6 +13,7 @@
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
+import android.text.TextUtils;
import android.text.method.ScrollingMovementMethod;
import android.util.Log;
import android.view.View;
@@ -146,8 +147,27 @@
mApkFile = new File(pathname);
if (mApkFile.isFile()) {
- // 涓嬭浇瀹屾瘯锛屽畨瑁� Apk
- Utils.installAPK(getContext(),fileName);
+ // 濡傛灉鏈夎缃甅D5锛屽垯鍒ゆ柇MD5鏄惁涓�鑷�
+ if (TextUtils.isEmpty(mFileMd5)) {
+ // 娌℃湁璁剧疆MD5锛岀洿鎺ュ畨瑁�
+ Utils.installAPK(getContext(),fileName);
+ } else {
+ // 璁剧疆浜哅D5锛屽垽鏂璏D5鏄惁涓�鑷�
+ String md5 = Utils.calculateMD5(mApkFile);
+ if (md5 != null && md5.equalsIgnoreCase(mFileMd5)) {
+ // 宸蹭笅杞斤紝鐩存帴瀹夎
+ Utils.installAPK(getContext(),fileName);
+ } else {
+ // 鍒犻櫎鏃� Apk
+ boolean delete = mApkFile.delete();
+ if (!delete) {
+ ToastUtils.showShort("鍒犻櫎鏃� Apk 澶辫触锛岃鍏堟墜鍔ㄥ垹闄ゅ悗閲嶈瘯");
+ }else {
+ // 閲嶆柊涓嬭浇
+ downloadApk();
+ }
+ }
+ }
} else {
// 鍒ゆ柇涓嬭浇鐘舵��
if (mDownloadComplete) {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
index 7d689e7..8f64146 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/FamilyMemorabiliaActivity.java
@@ -26,11 +26,7 @@
import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.github.gzuliyujiang.wheelpicker.DatePicker;
import com.github.gzuliyujiang.wheelpicker.contract.OnDatePickedListener;
-
-import java.util.Calendar;
import java.util.List;
-
-import io.reactivex.functions.Consumer;
/**
* @author Ljj
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeFragment.java
similarity index 95%
rename from app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
rename to app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeFragment.java
index 921ee34..9c5f136 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/FunctionFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/HomeFragment.java
@@ -2,7 +2,6 @@
import android.content.Intent;
import android.os.Bundle;
-import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
import android.widget.PopupWindow;
@@ -19,30 +18,28 @@
import com.application.zhangshi_app_android.databinding.FragmentFunctionBinding;
import com.application.zhangshi_app_android.ui.DLBaseFragment;
import com.application.zhangshi_app_android.ui.dialog.TotalAddDialog;
-import com.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
import com.application.zhangshi_app_android.ui.main.MainActivity;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
/**
* @author Ljj
* @date 2023.03.15. 20:14
- * @desc 鍔熻兘 Fragment
+ * @desc 棣栭〉 Fragment
*/
-public class FunctionFragment extends DLBaseFragment<FragmentFunctionBinding,FunctionFragmentViewModel> {
+public class HomeFragment extends DLBaseFragment<FragmentFunctionBinding,FunctionFragmentViewModel> {
private PopupWindow mOperatePopupWindow;
- private PopupWindow mAddPopupWindow;
private ImageCarouselFragment imageCarouselFragment;
private VideoCarouselFragment videoCarouselFragment;
- private FunctionFragment() {
+ private HomeFragment() {
}
- public static FunctionFragment newInstance() {
- FunctionFragment fragment = new FunctionFragment();
+ public static HomeFragment newInstance() {
+ HomeFragment fragment = new HomeFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
@@ -67,7 +64,7 @@
binding.layoutHomeRootNet.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- MainActivity.start(getSelfActivity(), HomeFragment.class);
+ MainActivity.start(getSelfActivity(), TreeFragment.class);
}
});
binding.layoutFamilyMemorabilia.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/function/VideoCarouselFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/function/VideoCarouselFragment.java
index c04c364..7402a51 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/function/VideoCarouselFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/function/VideoCarouselFragment.java
@@ -5,16 +5,12 @@
import androidx.viewpager2.widget.ViewPager2;
-import com.android.app_base.base.BaseConfig;
import com.android.app_base.base.adapter.BaseVp2FragmentAdapter;
import com.android.app_base.base.view.BaseFragment;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.BannerBean;
import com.application.zhangshi_app_android.databinding.FragmentVideoCarouselBinding;
import com.application.zhangshi_app_android.ui.SimpleViewModel;
-import com.application.zhangshi_app_android.ui.home.HomeFragment;
-import com.application.zhangshi_app_android.ui.personal_center.PersonalCenterFragment;
-import com.youth.banner.indicator.CircleIndicator;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/home/TreeFragment.java
similarity index 95%
rename from app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java
rename to app/src/main/java/com/application/zhangshi_app_android/ui/home/TreeFragment.java
index 467c702..52e7fd0 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/home/HomeFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/home/TreeFragment.java
@@ -26,15 +26,15 @@
/**
* @author Ljj
* @date 2023.3.15
- * @desc 棣栭〉 Fragment
+ * @desc 瀹舵棌瀵煎浘 Fragment
*/
-public class HomeFragment extends DLBaseFragment<FragmentHomeBinding,HomeFragmentViewModel> {
+public class TreeFragment extends DLBaseFragment<FragmentHomeBinding,HomeFragmentViewModel> {
private PopupWindow mOperatePopupWindow;
- public HomeFragment() {
+ public TreeFragment() {
}
- public static HomeFragment newInstance() {
- HomeFragment fragment = new HomeFragment();
+ public static TreeFragment newInstance() {
+ TreeFragment fragment = new TreeFragment();
Bundle args = new Bundle();
fragment.setArguments(args);
return fragment;
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
index ca8f00d..bd543f8 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/login/LoginActivity.java
@@ -54,7 +54,7 @@
@Override
public void initView() {
if (type == 1){
- binding.tvTitle.setText("寮犳皬APP璐﹀彿娉ㄥ唽");
+ binding.tvTitle.setText("鏈兘閮藉缃戣处鍙锋敞鍐�");
binding.layoutPasswordAgain.setVisibility(View.VISIBLE);
binding.layoutWxLogin.setVisibility(View.GONE);
binding.tvLogin.setText("娉ㄥ唽");
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
index 648db3d..9892470 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainActivity.java
@@ -4,10 +4,10 @@
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
-import android.os.Bundle;
import android.text.TextUtils;
+import android.util.TypedValue;
+import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
@@ -15,7 +15,6 @@
import androidx.viewpager2.widget.ViewPager2;
import com.android.app_base.base.adapter.BaseVp2FragmentAdapter;
-import com.android.app_base.base.view.BaseActivity;
import com.android.app_base.base.view.BaseFragment;
import com.android.app_base.helper.DoubleClickHelper;
import com.android.app_base.manager.AppManager;
@@ -27,23 +26,28 @@
import com.application.zhangshi_app_android.bean.GrowthExperienceInformationBean;
import com.application.zhangshi_app_android.bean.UpdateVersionBean;
import com.application.zhangshi_app_android.databinding.ActivityMainBinding;
+import com.application.zhangshi_app_android.ui.DLBaseActivity;
import com.application.zhangshi_app_android.ui.dialog.UpdateDialog;
-import com.application.zhangshi_app_android.ui.function.FunctionFragment;
-import com.application.zhangshi_app_android.ui.home.HomeFragment;
+import com.application.zhangshi_app_android.ui.function.HomeFragment;
+import com.application.zhangshi_app_android.ui.home.TreeFragment;
import com.application.zhangshi_app_android.ui.personal_center.PersonalCenterFragment;
import com.blankj.utilcode.util.AppUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.google.android.material.navigation.NavigationBarView;
-
-import java.io.Serializable;
/**
* @author Ljj
* @date 2023.3.15
* @desc app涓婚〉
*/
-public class MainActivity extends BaseActivity<ActivityMainBinding, MainViewModel> {
+public class MainActivity extends DLBaseActivity<ActivityMainBinding, MainViewModel> {
BaseVp2FragmentAdapter<BaseFragment> mPagerAdapter;
+
+ @Override
+ protected boolean isDrawerLayoutEnabled() {
+ return false;
+ }
+
@Override
public int getLayoutId() {
return R.layout.activity_main;
@@ -56,13 +60,15 @@
@Override
public void initParam() {
+
}
+
@Override
public void initView() {
mPagerAdapter = new BaseVp2FragmentAdapter<>(this);
mPagerAdapter.addFragment(HomeFragment.newInstance());
- mPagerAdapter.addFragment(FunctionFragment.newInstance());
+ mPagerAdapter.addFragment(TreeFragment.newInstance());
mPagerAdapter.addFragment(PersonalCenterFragment.newInstance());
binding.mainVp.setAdapter(mPagerAdapter);
binding.mainVp.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@@ -83,7 +89,7 @@
case R.id.navigation_home:
binding.mainVp.setCurrentItem(0);
return true;
- case R.id.navigation_function:
+ case R.id.navigation_tree:
binding.mainVp.setCurrentItem(1);
return true;
case R.id.navigation_personal_center:
@@ -95,6 +101,21 @@
return false;
}
});
+ Menu menu = binding.mainBnv.getMenu();
+ // 鑾峰彇褰撳墠涓婚涓殑鑿滃崟鍥炬爣璧勬簮
+ TypedValue typedValue1 = new TypedValue();
+ getTheme().resolveAttribute(R.attr.menuIconHome, typedValue1, true);
+ int icon1ResId = typedValue1.resourceId;
+ TypedValue typedValue2 = new TypedValue();
+ getTheme().resolveAttribute(R.attr.menuIconTree, typedValue2, true);
+ int icon2ResId = typedValue2.resourceId;
+ TypedValue typedValue3 = new TypedValue();
+ getTheme().resolveAttribute(R.attr.menuIconUser, typedValue3, true);
+ int icon3ResId = typedValue3.resourceId;
+ // 璁剧疆鑿滃崟椤瑰浘鏍�
+ menu.findItem(R.id.navigation_home).setIcon(icon1ResId);
+ menu.findItem(R.id.navigation_tree).setIcon(icon2ResId);
+ menu.findItem(R.id.navigation_personal_center).setIcon(icon3ResId);
}
@Override
@@ -130,6 +151,8 @@
.setUpdateLog(updateVersionBean.getContent())
// 涓嬭浇 URL
.setDownloadUrl(updateVersionBean.getAppUrl())
+ // 鏂囦欢 MD5
+ .setFileMd5(updateVersionBean.getMd5())
.show();
}
}
@@ -196,7 +219,7 @@
private static final String INTENT_KEY_IN_FRAGMENT_CLASS = "fragmentClass";
public static void start(Context context) {
- start(context, HomeFragment.class);
+ start(context, TreeFragment.class);
}
public static void start(Context context, Class<? extends Fragment> fragmentClass) {
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainViewModel.java b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainViewModel.java
index 7b41413..f96b1bd 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainViewModel.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/main/MainViewModel.java
@@ -28,7 +28,6 @@
* @desc
*/
public class MainViewModel extends BaseViewModel<DataRepository> {
-
private MutableLiveData<UpdateVersionBean> updateVersionBeanLiveData = new MutableLiveData<>();
private MutableLiveData<GrowthExperienceInformationBean> infoLiveData;//涓汉淇℃伅
diff --git a/app/src/main/java/com/application/zhangshi_app_android/ui/personal_center/PersonalCenterFragment.java b/app/src/main/java/com/application/zhangshi_app_android/ui/personal_center/PersonalCenterFragment.java
index ab5f4f8..43694a1 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/ui/personal_center/PersonalCenterFragment.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/ui/personal_center/PersonalCenterFragment.java
@@ -1,5 +1,6 @@
package com.application.zhangshi_app_android.ui.personal_center;
+import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -19,6 +20,7 @@
import androidx.fragment.app.Fragment;
import com.android.app_base.base.dialog.BaseDialog;
+import com.android.app_base.base.dialog.TipsDialog;
import com.android.app_base.base.dialog.UIDialog;
import com.android.app_base.base.dialog.WaitDialog;
import com.android.app_base.base.view.BaseFragment;
@@ -29,6 +31,7 @@
import com.android.app_base.utils.Utils;
import com.android.app_base.utils.rxbus.MessageEvent;
import com.android.app_base.utils.rxbus.RxBus;
+import com.android.app_base.widget.SwitchButton;
import com.application.zhangshi_app_android.BR;
import com.application.zhangshi_app_android.R;
import com.application.zhangshi_app_android.bean.AnnualHealthStatusBean;
@@ -38,6 +41,7 @@
import com.application.zhangshi_app_android.ui.dialog.PetOwnerInfoDialog;
import com.application.zhangshi_app_android.ui.function.PetMemoActivity;
import com.application.zhangshi_app_android.ui.login.LoginActivity;
+import com.application.zhangshi_app_android.ui.main.MainActivity;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.target.CustomTarget;
import com.bumptech.glide.request.transition.Transition;
@@ -70,6 +74,7 @@
public class PersonalCenterFragment extends DLBaseFragment<FragmentPersonalCenterBinding,PersonalCenterFragmentViewModel> {
private PopupWindow popupWindow;
private BaseDialog mWaitDialog;
+
public PersonalCenterFragment() {
}
@@ -128,6 +133,36 @@
}
});
+ binding.ivTakePhoto.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ PictureSelector.create(getSelfActivity())
+ .openGallery(SelectMimeType.ofImage())
+ .setImageEngine(GlideEngine.createGlideEngine())
+ .setCropEngine(new ImageFileCropEngine())// 璁剧疆瑁佸壀寮曟搸
+ .isMaxSelectEnabledMask(true)// 杈惧埌鏈�澶ч�夋嫨鏁版槸鍚﹀紑鍚閫夎挋灞�
+ .setMaxSelectNum(1)
+ .forResult(new OnResultCallbackListener<LocalMedia>() {
+ @Override
+ public void onResult(ArrayList<LocalMedia> result) {
+ if (result.size() == 0) return;
+ for (LocalMedia media : result) {
+ if (media.isCut()){
+ viewModel.updateInfo(media.getCutPath());
+ }else {
+ viewModel.updateInfo(media.getRealPath());
+ }
+ }
+
+ }
+
+ @Override
+ public void onCancel() {
+
+ }
+ });
+ }
+ });
binding.ivHead.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -158,6 +193,34 @@
});
}
});
+
+ binding.switchBtn.setChecked(UserManager.getInstance().getNightModeState());
+ binding.switchBtn.setOnCheckedChangeListener(new SwitchButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(SwitchButton button, boolean checked) {
+ if (checked == UserManager.getInstance().getNightModeState()) return;
+ new UIDialog.Builder(getContext())
+ .setTitle("鎻愮ず")
+ .setContent("鍒囨崲妯″紡闇�瑕侀噸鍚簲鐢ㄦ墠鑳界敓鏁堬紝鏄惁閲嶅惎锛�")
+ .setConfirm("纭畾")
+ .setCancel("鍙栨秷")
+ .setListener(new UIDialog.OnListener() {
+ @Override
+ public void onConfirm(BaseDialog dialog) {
+ UserManager.getInstance().saveNightModeState(checked);
+ AppManager.getAppManager().restartApp(getContext());
+ }
+
+ @Override
+ public void onCancel(BaseDialog dialog) {
+ UIDialog.OnListener.super.onCancel(dialog);
+ binding.switchBtn.setChecked(!checked);
+ }
+ })
+ .setCancelable(false)
+ .show();
+ }
+ });
}
@Override
diff --git a/app/src/main/java/com/application/zhangshi_app_android/widget/Node.java b/app/src/main/java/com/application/zhangshi_app_android/widget/Node.java
index 5c98ec3..7447534 100644
--- a/app/src/main/java/com/application/zhangshi_app_android/widget/Node.java
+++ b/app/src/main/java/com/application/zhangshi_app_android/widget/Node.java
@@ -16,6 +16,7 @@
import androidx.databinding.DataBindingUtil;
import com.android.app_base.manager.AppManager;
+import com.android.app_base.manager.UserManager;
import com.android.app_base.utils.GlideUtil;
import com.android.app_base.utils.ScreenSizeUtils;
import com.application.zhangshi_app_android.R;
@@ -227,9 +228,14 @@
//鑾峰彇瀛椾綋
Typeface typeface = ResourcesCompat.getFont(context, com.android.app_base.R.font.roboto_regular);
binding.tvName.setTypeface(typeface);
+
}
// 浣跨敤databinding鏃犳硶娴嬮噺view鐨勫甫鍐呭鐨勫噯纭楂橈紝鎵�浠ヨ繖閲屾墜鍔ㄨ缃竴涓�
binding.tvGeneration.setText(bean.getIdentity()+"");
+ if (bean.getNickName().equals(UserManager.getInstance().getUserName())){
+ binding.cvContainer.setCardBackgroundColor(Color.parseColor("#FFCEE4FD"));
+ binding.ivMyself.setVisibility(View.VISIBLE);
+ }
}
familyMemberView.measure(View.MeasureSpec.makeMeasureSpec((1 << 30) - 1, View.MeasureSpec.AT_MOST),
View.MeasureSpec.makeMeasureSpec((1 << 30) - 1, View.MeasureSpec.AT_MOST));
diff --git a/app/src/main/res/drawable-xhdpi/ic_audio_night.png b/app/src/main/res/drawable-xhdpi/ic_audio_night.png
new file mode 100644
index 0000000..ca85449
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_audio_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_checked_night.png b/app/src/main/res/drawable-xhdpi/ic_checked_night.png
new file mode 100644
index 0000000..481a50b
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_checked_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_excel_night.png b/app/src/main/res/drawable-xhdpi/ic_excel_night.png
new file mode 100644
index 0000000..04f59d9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_excel_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_flower_night.png b/app/src/main/res/drawable-xhdpi/ic_flower_night.png
new file mode 100644
index 0000000..d62544c
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_flower_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_fold_night.png b/app/src/main/res/drawable-xhdpi/ic_fold_night.png
new file mode 100644
index 0000000..4a5ec66
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_fold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_asset.png b/app/src/main/res/drawable-xhdpi/ic_function_asset.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_asset.png
rename to app/src/main/res/drawable-xhdpi/ic_function_asset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_asset_night.png b/app/src/main/res/drawable-xhdpi/ic_function_asset_night.png
new file mode 100644
index 0000000..9be5a5a
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_asset_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_certificate.png b/app/src/main/res/drawable-xhdpi/ic_function_certificate.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_certificate.png
rename to app/src/main/res/drawable-xhdpi/ic_function_certificate.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_certificate_night.png b/app/src/main/res/drawable-xhdpi/ic_function_certificate_night.png
new file mode 100644
index 0000000..dd51408
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_certificate_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_cleaning.png b/app/src/main/res/drawable-xhdpi/ic_function_cleaning.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_cleaning.png
rename to app/src/main/res/drawable-xhdpi/ic_function_cleaning.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_cleaning_night.png b/app/src/main/res/drawable-xhdpi/ic_function_cleaning_night.png
new file mode 100644
index 0000000..a1b043d
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_cleaning_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_family_root_net_night.png b/app/src/main/res/drawable-xhdpi/ic_function_family_root_net_night.png
new file mode 100644
index 0000000..7e0d82b
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_family_root_net_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_growth.png b/app/src/main/res/drawable-xhdpi/ic_function_growth.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_growth.png
rename to app/src/main/res/drawable-xhdpi/ic_function_growth.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_growth_night.png b/app/src/main/res/drawable-xhdpi/ic_function_growth_night.png
new file mode 100644
index 0000000..325d470
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_growth_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_health.png b/app/src/main/res/drawable-xhdpi/ic_function_health.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_health.png
rename to app/src/main/res/drawable-xhdpi/ic_function_health.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_health_night.png b/app/src/main/res/drawable-xhdpi/ic_function_health_night.png
new file mode 100644
index 0000000..2f69f9b
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_health_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_home_devices.png b/app/src/main/res/drawable-xhdpi/ic_function_home_devices.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_home_devices.png
rename to app/src/main/res/drawable-xhdpi/ic_function_home_devices.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_home_devices_night.png b/app/src/main/res/drawable-xhdpi/ic_function_home_devices_night.png
new file mode 100644
index 0000000..eb1b3bd
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_home_devices_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_honor.png b/app/src/main/res/drawable-xhdpi/ic_function_honor.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_honor.png
rename to app/src/main/res/drawable-xhdpi/ic_function_honor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_honor_night.png b/app/src/main/res/drawable-xhdpi/ic_function_honor_night.png
new file mode 100644
index 0000000..b917d2c
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_honor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_income_expense.png b/app/src/main/res/drawable-xhdpi/ic_function_income_expense.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_income_expense.png
rename to app/src/main/res/drawable-xhdpi/ic_function_income_expense.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_income_expense_night.png b/app/src/main/res/drawable-xhdpi/ic_function_income_expense_night.png
new file mode 100644
index 0000000..29635f0
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_income_expense_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_little_doctor.png b/app/src/main/res/drawable-xhdpi/ic_function_little_doctor.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_little_doctor.png
rename to app/src/main/res/drawable-xhdpi/ic_function_little_doctor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_little_doctor_night.png b/app/src/main/res/drawable-xhdpi/ic_function_little_doctor_night.png
new file mode 100644
index 0000000..c4ab133
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_little_doctor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_mail_list.png b/app/src/main/res/drawable-xhdpi/ic_function_mail_list.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_mail_list.png
rename to app/src/main/res/drawable-xhdpi/ic_function_mail_list.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_mail_list_night.png b/app/src/main/res/drawable-xhdpi/ic_function_mail_list_night.png
new file mode 100644
index 0000000..af61ee3
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_mail_list_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_marriage.png b/app/src/main/res/drawable-xhdpi/ic_function_marriage.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_marriage.png
rename to app/src/main/res/drawable-xhdpi/ic_function_marriage.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_marriage_night.png b/app/src/main/res/drawable-xhdpi/ic_function_marriage_night.png
new file mode 100644
index 0000000..17d86f6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_marriage_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_notes.png b/app/src/main/res/drawable-xhdpi/ic_function_notes.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_notes.png
rename to app/src/main/res/drawable-xhdpi/ic_function_notes.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_notes_night.png b/app/src/main/res/drawable-xhdpi/ic_function_notes_night.png
new file mode 100644
index 0000000..53a4212
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_notes_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_pamper_pet.png b/app/src/main/res/drawable-xhdpi/ic_function_pamper_pet.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_pamper_pet.png
rename to app/src/main/res/drawable-xhdpi/ic_function_pamper_pet.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_pamper_pet_night.png b/app/src/main/res/drawable-xhdpi/ic_function_pamper_pet_night.png
new file mode 100644
index 0000000..4d874af
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_pamper_pet_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_privacy.png b/app/src/main/res/drawable-xhdpi/ic_function_privacy.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_privacy.png
rename to app/src/main/res/drawable-xhdpi/ic_function_privacy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_privacy_night.png b/app/src/main/res/drawable-xhdpi/ic_function_privacy_night.png
new file mode 100644
index 0000000..2f11c56
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_privacy_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_property.png b/app/src/main/res/drawable-xhdpi/ic_function_property.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_property.png
rename to app/src/main/res/drawable-xhdpi/ic_function_property.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_property_night.png b/app/src/main/res/drawable-xhdpi/ic_function_property_night.png
new file mode 100644
index 0000000..42228e2
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_property_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_tour.png b/app/src/main/res/drawable-xhdpi/ic_function_tour.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_tour.png
rename to app/src/main/res/drawable-xhdpi/ic_function_tour.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_tour_night.png b/app/src/main/res/drawable-xhdpi/ic_function_tour_night.png
new file mode 100644
index 0000000..44312bf
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_tour_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/function_wish.png b/app/src/main/res/drawable-xhdpi/ic_function_wish.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/function_wish.png
rename to app/src/main/res/drawable-xhdpi/ic_function_wish.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_function_wish_night.png b/app/src/main/res/drawable-xhdpi/ic_function_wish_night.png
new file mode 100644
index 0000000..692bb66
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_function_wish_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_home_selected_night.png b/app/src/main/res/drawable-xhdpi/ic_home_selected_night.png
new file mode 100644
index 0000000..7f339fe
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_home_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_img_night.png b/app/src/main/res/drawable-xhdpi/ic_img_night.png
new file mode 100644
index 0000000..f160cc9
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_img_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_myself.png b/app/src/main/res/drawable-xhdpi/ic_myself.png
new file mode 100644
index 0000000..09c1930
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_myself.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_others_night.png b/app/src/main/res/drawable-xhdpi/ic_others_night.png
new file mode 100644
index 0000000..cbd5034
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_others_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_pdf_night.png b/app/src/main/res/drawable-xhdpi/ic_pdf_night.png
new file mode 100644
index 0000000..dc3c864
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_pdf_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_personal_center_selected_night.png b/app/src/main/res/drawable-xhdpi/ic_personal_center_selected_night.png
new file mode 100644
index 0000000..79cf6c6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_personal_center_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_ppt_night.png b/app/src/main/res/drawable-xhdpi/ic_ppt_night.png
new file mode 100644
index 0000000..44fdce8
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_ppt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tree_default.png b/app/src/main/res/drawable-xhdpi/ic_tree_default.png
new file mode 100644
index 0000000..ad80fda
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_tree_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_tree_selected.png b/app/src/main/res/drawable-xhdpi/ic_tree_selected.png
new file mode 100644
index 0000000..438b0b4
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_tree_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_txt_night.png b/app/src/main/res/drawable-xhdpi/ic_txt_night.png
new file mode 100644
index 0000000..5326a32
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_txt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_unfold_night.png b/app/src/main/res/drawable-xhdpi/ic_unfold_night.png
new file mode 100644
index 0000000..edf1bad
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_unfold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_vector_green.png b/app/src/main/res/drawable-xhdpi/ic_vector_green.png
new file mode 100644
index 0000000..9fc0c07
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_vector_green.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_video_night.png b/app/src/main/res/drawable-xhdpi/ic_video_night.png
new file mode 100644
index 0000000..73f3d0f
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_video_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_word_night.png b/app/src/main/res/drawable-xhdpi/ic_word_night.png
new file mode 100644
index 0000000..a60833e
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_word_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_zip_night.png b/app/src/main/res/drawable-xhdpi/ic_zip_night.png
new file mode 100644
index 0000000..c9e1676
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_zip_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_audio_night.png b/app/src/main/res/drawable-xxhdpi/ic_audio_night.png
new file mode 100644
index 0000000..89d9176
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_audio_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_checked_night.png b/app/src/main/res/drawable-xxhdpi/ic_checked_night.png
new file mode 100644
index 0000000..dfd02b8
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_checked_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_excel_night.png b/app/src/main/res/drawable-xxhdpi/ic_excel_night.png
new file mode 100644
index 0000000..51d258d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_excel_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_flower_night.png b/app/src/main/res/drawable-xxhdpi/ic_flower_night.png
new file mode 100644
index 0000000..0c4f7c5
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_flower_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_fold_night.png b/app/src/main/res/drawable-xxhdpi/ic_fold_night.png
new file mode 100644
index 0000000..27d78f6
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_fold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_asset.png b/app/src/main/res/drawable-xxhdpi/ic_function_asset.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_asset.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_asset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_asset_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_asset_night.png
new file mode 100644
index 0000000..357a087
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_asset_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_certificate.png b/app/src/main/res/drawable-xxhdpi/ic_function_certificate.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_certificate.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_certificate.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_certificate_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_certificate_night.png
new file mode 100644
index 0000000..72d0b27
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_certificate_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_cleaning.png b/app/src/main/res/drawable-xxhdpi/ic_function_cleaning.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_cleaning.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_cleaning.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_cleaning_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_cleaning_night.png
new file mode 100644
index 0000000..31aa3a7
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_cleaning_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_family_root_net_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_family_root_net_night.png
new file mode 100644
index 0000000..9887ddf
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_family_root_net_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_growth.png b/app/src/main/res/drawable-xxhdpi/ic_function_growth.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_growth.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_growth.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_growth_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_growth_night.png
new file mode 100644
index 0000000..fbba369
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_growth_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_health.png b/app/src/main/res/drawable-xxhdpi/ic_function_health.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_health.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_health.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_health_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_health_night.png
new file mode 100644
index 0000000..ed8204e
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_health_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_home_devices.png b/app/src/main/res/drawable-xxhdpi/ic_function_home_devices.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_home_devices.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_home_devices.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_home_devices_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_home_devices_night.png
new file mode 100644
index 0000000..25a1b18
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_home_devices_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_honor.png b/app/src/main/res/drawable-xxhdpi/ic_function_honor.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_honor.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_honor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_honor_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_honor_night.png
new file mode 100644
index 0000000..a5cfced
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_honor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_income_expense.png b/app/src/main/res/drawable-xxhdpi/ic_function_income_expense.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_income_expense.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_income_expense.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_income_expense_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_income_expense_night.png
new file mode 100644
index 0000000..29d3ef9
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_income_expense_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_little_doctor.png b/app/src/main/res/drawable-xxhdpi/ic_function_little_doctor.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_little_doctor.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_little_doctor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_little_doctor_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_little_doctor_night.png
new file mode 100644
index 0000000..6925219
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_little_doctor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_mail_list_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_mail_list_night.png
new file mode 100644
index 0000000..29f33d4
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_mail_list_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_marriage.png b/app/src/main/res/drawable-xxhdpi/ic_function_marriage.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_marriage.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_marriage.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_marriage_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_marriage_night.png
new file mode 100644
index 0000000..cee6ec3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_marriage_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_notes.png b/app/src/main/res/drawable-xxhdpi/ic_function_notes.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_notes.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_notes.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_notes_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_notes_night.png
new file mode 100644
index 0000000..4533968
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_notes_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_pamper_pet.png b/app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_pamper_pet.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet_night.png
new file mode 100644
index 0000000..5a2874f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_pamper_pet_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_privacy.png b/app/src/main/res/drawable-xxhdpi/ic_function_privacy.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_privacy.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_privacy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_privacy_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_privacy_night.png
new file mode 100644
index 0000000..d7b04bd
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_privacy_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_property.png b/app/src/main/res/drawable-xxhdpi/ic_function_property.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_property.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_property.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_property_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_property_night.png
new file mode 100644
index 0000000..fde885f
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_property_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_tour.png b/app/src/main/res/drawable-xxhdpi/ic_function_tour.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_tour.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_tour.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_tour_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_tour_night.png
new file mode 100644
index 0000000..3119466
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_tour_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/function_wish.png b/app/src/main/res/drawable-xxhdpi/ic_function_wish.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/function_wish.png
rename to app/src/main/res/drawable-xxhdpi/ic_function_wish.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_function_wish_night.png b/app/src/main/res/drawable-xxhdpi/ic_function_wish_night.png
new file mode 100644
index 0000000..ffc48e1
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_function_wish_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_home_selected_night.png b/app/src/main/res/drawable-xxhdpi/ic_home_selected_night.png
new file mode 100644
index 0000000..e1f5ccf
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_home_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_img_night.png b/app/src/main/res/drawable-xxhdpi/ic_img_night.png
new file mode 100644
index 0000000..72d81bc
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_img_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_myself.png b/app/src/main/res/drawable-xxhdpi/ic_myself.png
new file mode 100644
index 0000000..9745a76
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_myself.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_others_night.png b/app/src/main/res/drawable-xxhdpi/ic_others_night.png
new file mode 100644
index 0000000..46454a6
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_others_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_pdf_night.png b/app/src/main/res/drawable-xxhdpi/ic_pdf_night.png
new file mode 100644
index 0000000..675ff74
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_pdf_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_personal_center_selected_night.png b/app/src/main/res/drawable-xxhdpi/ic_personal_center_selected_night.png
new file mode 100644
index 0000000..d8eab18
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_personal_center_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_ppt_night.png b/app/src/main/res/drawable-xxhdpi/ic_ppt_night.png
new file mode 100644
index 0000000..3486e39
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_ppt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tree_default.png b/app/src/main/res/drawable-xxhdpi/ic_tree_default.png
new file mode 100644
index 0000000..9f85c84
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_tree_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_tree_selected.png b/app/src/main/res/drawable-xxhdpi/ic_tree_selected.png
new file mode 100644
index 0000000..702646a
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_tree_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_txt_night.png b/app/src/main/res/drawable-xxhdpi/ic_txt_night.png
new file mode 100644
index 0000000..0b04201
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_txt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_unfold_night.png b/app/src/main/res/drawable-xxhdpi/ic_unfold_night.png
new file mode 100644
index 0000000..b3c6704
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_unfold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_vector_green.png b/app/src/main/res/drawable-xxhdpi/ic_vector_green.png
new file mode 100644
index 0000000..4390882
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_vector_green.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_video_night.png b/app/src/main/res/drawable-xxhdpi/ic_video_night.png
new file mode 100644
index 0000000..85a2889
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_video_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_word_night.png b/app/src/main/res/drawable-xxhdpi/ic_word_night.png
new file mode 100644
index 0000000..596950d
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_word_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_zip_night.png b/app/src/main/res/drawable-xxhdpi/ic_zip_night.png
new file mode 100644
index 0000000..01b370b
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_zip_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_login_home.png b/app/src/main/res/drawable-xxxhdpi/bg_login_home.png
new file mode 100644
index 0000000..2e856de
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/bg_login_home.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/bg_login_zhang.png b/app/src/main/res/drawable-xxxhdpi/bg_login_zhang.png
new file mode 100644
index 0000000..3fe9107
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/bg_login_zhang.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/function_family_root_net.png b/app/src/main/res/drawable-xxxhdpi/function_family_root_net.png
new file mode 100644
index 0000000..34e9ab3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/function_family_root_net.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_audio_night.png b/app/src/main/res/drawable-xxxhdpi/ic_audio_night.png
new file mode 100644
index 0000000..a83bcbf
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_audio_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_checked_night.png b/app/src/main/res/drawable-xxxhdpi/ic_checked_night.png
new file mode 100644
index 0000000..05ec30a
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_checked_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_excel_night.png b/app/src/main/res/drawable-xxxhdpi/ic_excel_night.png
new file mode 100644
index 0000000..c5170d9
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_excel_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_flower_night.png b/app/src/main/res/drawable-xxxhdpi/ic_flower_night.png
new file mode 100644
index 0000000..987f8b3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_flower_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_fold_night.png b/app/src/main/res/drawable-xxxhdpi/ic_fold_night.png
new file mode 100644
index 0000000..bfab9e9
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_fold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_asset.png b/app/src/main/res/drawable-xxxhdpi/ic_function_asset.png
new file mode 100644
index 0000000..c53ec4c
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_asset.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_asset_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_asset_night.png
new file mode 100644
index 0000000..7135d72
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_asset_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_certificate.png b/app/src/main/res/drawable-xxxhdpi/ic_function_certificate.png
new file mode 100644
index 0000000..fd5e175
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_certificate.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_certificate_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_certificate_night.png
new file mode 100644
index 0000000..501e6e0
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_certificate_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning.png b/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning.png
new file mode 100644
index 0000000..a7704c5
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning_night.png
new file mode 100644
index 0000000..84a4c50
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_cleaning_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_default.png b/app/src/main/res/drawable-xxxhdpi/ic_function_default.png
new file mode 100644
index 0000000..447b274
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_family_root_net_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_family_root_net_night.png
new file mode 100644
index 0000000..ab0d18f
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_family_root_net_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_growth.png b/app/src/main/res/drawable-xxxhdpi/ic_function_growth.png
new file mode 100644
index 0000000..68006b8
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_growth.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_growth_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_growth_night.png
new file mode 100644
index 0000000..5633fb6
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_growth_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_health.png b/app/src/main/res/drawable-xxxhdpi/ic_function_health.png
new file mode 100644
index 0000000..ad50a46
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_health.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_health_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_health_night.png
new file mode 100644
index 0000000..8e7e0e8
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_health_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices.png b/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices.png
new file mode 100644
index 0000000..95e0a67
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices_night.png
new file mode 100644
index 0000000..0b24808
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_home_devices_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_honor.png b/app/src/main/res/drawable-xxxhdpi/ic_function_honor.png
new file mode 100644
index 0000000..f14ab59
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_honor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_honor_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_honor_night.png
new file mode 100644
index 0000000..12bae21
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_honor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense.png b/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense.png
new file mode 100644
index 0000000..504d2c1
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense_night.png
new file mode 100644
index 0000000..be5e5e7
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_income_expense_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor.png b/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor.png
new file mode 100644
index 0000000..b7e6517
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor_night.png
new file mode 100644
index 0000000..a84df3a
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_little_doctor_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list.png b/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list.png
new file mode 100644
index 0000000..95be173
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list_night.png
new file mode 100644
index 0000000..9a4bb5e
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_mail_list_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_marriage.png b/app/src/main/res/drawable-xxxhdpi/ic_function_marriage.png
new file mode 100644
index 0000000..1b00ea2
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_marriage.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_marriage_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_marriage_night.png
new file mode 100644
index 0000000..41c51e8
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_marriage_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_notes.png b/app/src/main/res/drawable-xxxhdpi/ic_function_notes.png
new file mode 100644
index 0000000..9f260b9
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_notes.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_notes_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_notes_night.png
new file mode 100644
index 0000000..da4c56b
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_notes_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet.png b/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet.png
new file mode 100644
index 0000000..527e44d
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet_night.png
new file mode 100644
index 0000000..20d4c81
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_pamper_pet_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_privacy.png b/app/src/main/res/drawable-xxxhdpi/ic_function_privacy.png
new file mode 100644
index 0000000..89b7c36
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_privacy.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_privacy_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_privacy_night.png
new file mode 100644
index 0000000..638f1d2
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_privacy_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_property.png b/app/src/main/res/drawable-xxxhdpi/ic_function_property.png
new file mode 100644
index 0000000..14cffd3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_property.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_property_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_property_night.png
new file mode 100644
index 0000000..4b9a665
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_property_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_selected.png b/app/src/main/res/drawable-xxxhdpi/ic_function_selected.png
new file mode 100644
index 0000000..c165ed6
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_tour.png b/app/src/main/res/drawable-xxxhdpi/ic_function_tour.png
new file mode 100644
index 0000000..4b2e3d3
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_tour.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_tour_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_tour_night.png
new file mode 100644
index 0000000..b04a9fa
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_tour_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_wish.png b/app/src/main/res/drawable-xxxhdpi/ic_function_wish.png
new file mode 100644
index 0000000..622cffa
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_wish.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_function_wish_night.png b/app/src/main/res/drawable-xxxhdpi/ic_function_wish_night.png
new file mode 100644
index 0000000..483f8ff
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_function_wish_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_default.png b/app/src/main/res/drawable-xxxhdpi/ic_home_default.png
new file mode 100644
index 0000000..a1e14e5
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_home_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_selected.png b/app/src/main/res/drawable-xxxhdpi/ic_home_selected.png
new file mode 100644
index 0000000..0db5c5c
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_home_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_home_selected_night.png b/app/src/main/res/drawable-xxxhdpi/ic_home_selected_night.png
new file mode 100644
index 0000000..0addafa
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_home_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_img_night.png b/app/src/main/res/drawable-xxxhdpi/ic_img_night.png
new file mode 100644
index 0000000..fd0a113
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_img_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_myself.png b/app/src/main/res/drawable-xxxhdpi/ic_myself.png
new file mode 100644
index 0000000..dfba661
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_myself.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_others_night.png b/app/src/main/res/drawable-xxxhdpi/ic_others_night.png
new file mode 100644
index 0000000..42a6f61
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_others_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_pdf_night.png b/app/src/main/res/drawable-xxxhdpi/ic_pdf_night.png
new file mode 100644
index 0000000..de782e5
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_pdf_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_personal_center_default.png b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_default.png
new file mode 100644
index 0000000..d6ec3b7
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected.png b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected.png
new file mode 100644
index 0000000..4337f0f
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected_night.png b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected_night.png
new file mode 100644
index 0000000..3b31136
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_personal_center_selected_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_ppt_night.png b/app/src/main/res/drawable-xxxhdpi/ic_ppt_night.png
new file mode 100644
index 0000000..5aecc36
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_ppt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tree_default.png b/app/src/main/res/drawable-xxxhdpi/ic_tree_default.png
new file mode 100644
index 0000000..e35cafa
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_tree_default.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_tree_selected.png b/app/src/main/res/drawable-xxxhdpi/ic_tree_selected.png
new file mode 100644
index 0000000..870859c
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_tree_selected.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_txt_night.png b/app/src/main/res/drawable-xxxhdpi/ic_txt_night.png
new file mode 100644
index 0000000..6569114
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_txt_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_unfold_night.png b/app/src/main/res/drawable-xxxhdpi/ic_unfold_night.png
new file mode 100644
index 0000000..f197df8
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_unfold_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_vector_green.png b/app/src/main/res/drawable-xxxhdpi/ic_vector_green.png
new file mode 100644
index 0000000..f823f15
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_vector_green.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_video_night.png b/app/src/main/res/drawable-xxxhdpi/ic_video_night.png
new file mode 100644
index 0000000..229bcb7
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_video_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_word_night.png b/app/src/main/res/drawable-xxxhdpi/ic_word_night.png
new file mode 100644
index 0000000..70367ce
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_word_night.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_wx_login.png b/app/src/main/res/drawable-xxxhdpi/ic_wx_login.png
new file mode 100644
index 0000000..d7ad709
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_wx_login.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_zip_night.png b/app/src/main/res/drawable-xxxhdpi/ic_zip_night.png
new file mode 100644
index 0000000..2edd1cc
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_zip_night.png
Binary files differ
diff --git a/app/src/main/res/drawable/ic_function_family_root_net.xml b/app/src/main/res/drawable/ic_function_family_root_net.xml
new file mode 100644
index 0000000..8672026
--- /dev/null
+++ b/app/src/main/res/drawable/ic_function_family_root_net.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="33dp"
+ android:height="25dp"
+ android:viewportWidth="33"
+ android:viewportHeight="25">
+ <path
+ android:pathData="M22.661,9.828C25.371,9.828 27.575,7.624 27.575,4.914C27.575,2.204 25.371,0 22.661,0C19.951,0 17.747,2.204 17.747,4.914C17.747,7.624 19.951,9.828 22.661,9.828ZM22.661,2.313C24.095,2.313 25.262,3.48 25.262,4.914C25.262,6.349 24.095,7.516 22.661,7.516C21.226,7.516 20.059,6.349 20.059,4.914C20.059,3.48 21.226,2.313 22.661,2.313ZM10.238,10.009C12.948,10.009 15.152,7.805 15.152,5.095C15.152,2.385 12.948,0.181 10.238,0.181C7.528,0.181 5.324,2.385 5.324,5.095C5.324,7.805 7.528,10.009 10.238,10.009ZM10.238,2.493C11.673,2.493 12.84,3.66 12.84,5.095C12.84,6.529 11.673,7.696 10.238,7.696C8.804,7.696 7.637,6.529 7.637,5.095C7.637,3.66 8.804,2.493 10.238,2.493ZM31.528,20.972C32.167,20.972 32.684,20.455 32.684,19.815C32.684,17.152 31.647,14.648 29.764,12.766C27.882,10.883 25.378,9.846 22.715,9.846C21.165,9.846 19.68,10.193 18.299,10.876C17.729,11.158 17.494,11.852 17.775,12.426C18.057,13.001 18.751,13.232 19.326,12.95C20.384,12.426 21.526,12.159 22.715,12.159C26.935,12.159 30.371,15.595 30.371,19.815C30.371,20.455 30.888,20.972 31.528,20.972ZM1.48,21.152C2.119,21.152 2.636,20.635 2.636,19.996C2.636,15.776 6.072,12.339 10.292,12.339C11.481,12.339 12.616,12.603 13.671,13.123C14.245,13.405 14.936,13.17 15.221,12.599C15.503,12.025 15.268,11.335 14.697,11.049C13.32,10.37 11.839,10.027 10.296,10.027C7.633,10.027 5.129,11.064 3.247,12.946C1.364,14.829 0.327,17.333 0.327,19.996C0.323,20.635 0.84,21.152 1.48,21.152Z"
+ android:fillColor="#F6739F"/>
+ <path
+ android:pathData="M16.536,16.39C18.505,16.39 20.11,14.785 20.11,12.816C20.11,10.847 18.505,9.243 16.536,9.243C14.567,9.243 12.963,10.847 12.963,12.816C12.963,14.785 14.567,16.39 16.536,16.39ZM16.536,11.555C17.23,11.555 17.797,12.123 17.797,12.816C17.797,13.51 17.23,14.077 16.536,14.077C15.842,14.077 15.275,13.51 15.275,12.816C15.275,12.123 15.842,11.555 16.536,11.555ZM10.932,24.332C11.571,24.332 12.088,23.815 12.088,23.176C12.088,20.722 14.083,18.728 16.536,18.728C18.99,18.728 20.984,20.722 20.984,23.176C20.984,23.815 21.501,24.332 22.14,24.332C22.78,24.332 23.297,23.815 23.297,23.176C23.297,19.447 20.265,16.415 16.536,16.415C12.807,16.415 9.776,19.447 9.776,23.176C9.776,23.815 10.292,24.332 10.932,24.332Z"
+ android:fillColor="#F6739F"/>
+</vector>
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_function_night.xml b/app/src/main/res/drawable/selector_bottom_navigation_function_night.xml
new file mode 100644
index 0000000..146c26f
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bottom_navigation_function_night.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- 鎸夊帇鐘舵�� -->
+ <item android:drawable="@drawable/ic_function_selected" android:state_checked="true" />
+
+ <!-- 榛樿鐘舵�� -->
+ <item android:drawable="@drawable/ic_function_default" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_home_night.xml b/app/src/main/res/drawable/selector_bottom_navigation_home_night.xml
new file mode 100644
index 0000000..95bb5c3
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bottom_navigation_home_night.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- 鎸夊帇鐘舵�� -->
+ <item android:drawable="@drawable/ic_home_selected_night" android:state_checked="true" />
+
+ <!-- 榛樿鐘舵�� -->
+ <item android:drawable="@drawable/ic_home_default" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_personal_center_night.xml b/app/src/main/res/drawable/selector_bottom_navigation_personal_center_night.xml
new file mode 100644
index 0000000..4d5e1fc
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bottom_navigation_personal_center_night.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- 鎸夊帇鐘舵�� -->
+ <item android:drawable="@drawable/ic_personal_center_selected_night" android:state_checked="true" />
+
+ <!-- 榛樿鐘舵�� -->
+ <item android:drawable="@drawable/ic_personal_center_default" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_text_color.xml b/app/src/main/res/drawable/selector_bottom_navigation_text_color.xml
index 1ab0a16..2df31f9 100644
--- a/app/src/main/res/drawable/selector_bottom_navigation_text_color.xml
+++ b/app/src/main/res/drawable/selector_bottom_navigation_text_color.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 閫変腑鐘舵�� -->
- <item android:color="@color/color_FFF08EBA_text_pink" android:state_checked="true" />
+ <item android:color="?attr/text_color_main" android:state_checked="true" />
<!-- <item android:drawable="@drawable/yw_action_shape" android:state_checked="true" />-->
<!-- 榛樿鐘舵�� -->
diff --git a/app/src/main/res/drawable/selector_bottom_navigation_tree.xml b/app/src/main/res/drawable/selector_bottom_navigation_tree.xml
new file mode 100644
index 0000000..916c46c
--- /dev/null
+++ b/app/src/main/res/drawable/selector_bottom_navigation_tree.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- 鎸夊帇鐘舵�� -->
+ <item android:drawable="@drawable/ic_tree_selected" android:state_checked="true" />
+
+ <!-- 榛樿鐘舵�� -->
+ <item android:drawable="@drawable/ic_tree_default" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_checkbox_night.xml b/app/src/main/res/drawable/selector_checkbox_night.xml
new file mode 100644
index 0000000..8934c6b
--- /dev/null
+++ b/app/src/main/res/drawable/selector_checkbox_night.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+ <item
+ android:state_checked="true"
+ android:drawable="@drawable/ic_checked_night" />
+ <item
+ android:state_checked="false"
+ android:drawable="@drawable/ic_unchecked" />
+ <item
+ android:drawable="@drawable/ic_unchecked" /><!-- The default one -->
+</selector>
diff --git a/app/src/main/res/drawable/shape_gradient_tree_myself.xml b/app/src/main/res/drawable/shape_gradient_tree_myself.xml
new file mode 100644
index 0000000..9d9dfa2
--- /dev/null
+++ b/app/src/main/res/drawable/shape_gradient_tree_myself.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <gradient
+ android:startColor="#4DAAD3FF"
+ android:centerColor="#734EBDFF"
+ android:endColor="#8C00AAFF"
+ android:angle="270"
+ />
+ <corners
+ android:radius="10dp"
+ />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
index 7d75a1e..246b2ca 100644
--- a/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
+++ b/app/src/main/res/layout/acitivity_tourism_experience_detail.xml
@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_annual_health_status.xml b/app/src/main/res/layout/activity_annual_health_status.xml
index 0a4519f..e50d378 100644
--- a/app/src/main/res/layout/activity_annual_health_status.xml
+++ b/app/src/main/res/layout/activity_annual_health_status.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_annual_health_status_detail.xml b/app/src/main/res/layout/activity_annual_health_status_detail.xml
index b0b643d..b89fb34 100644
--- a/app/src/main/res/layout/activity_annual_health_status_detail.xml
+++ b/app/src/main/res/layout/activity_annual_health_status_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_basic_info.xml b/app/src/main/res/layout/activity_basic_info.xml
index e3a0094..d36db91 100644
--- a/app/src/main/res/layout/activity_basic_info.xml
+++ b/app/src/main/res/layout/activity_basic_info.xml
@@ -11,7 +11,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/title_bar"
diff --git a/app/src/main/res/layout/activity_certificate_of_honor.xml b/app/src/main/res/layout/activity_certificate_of_honor.xml
index 935d9d8..77714ea 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor.xml
@@ -14,7 +14,7 @@
android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_certificate_of_honor_detail.xml b/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
index 412ff48..05955ab 100644
--- a/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
+++ b/app/src/main/res/layout/activity_certificate_of_honor_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_clean_storage.xml b/app/src/main/res/layout/activity_clean_storage.xml
index 16344a1..1044d32 100644
--- a/app/src/main/res/layout/activity_clean_storage.xml
+++ b/app/src/main/res/layout/activity_clean_storage.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_clean_storage_detail.xml b/app/src/main/res/layout/activity_clean_storage_detail.xml
index fa8bc1c..54ee2ae 100644
--- a/app/src/main/res/layout/activity_clean_storage_detail.xml
+++ b/app/src/main/res/layout/activity_clean_storage_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_contacts.xml b/app/src/main/res/layout/activity_contacts.xml
index 30878d6..b9c4f5d 100644
--- a/app/src/main/res/layout/activity_contacts.xml
+++ b/app/src/main/res/layout/activity_contacts.xml
@@ -13,7 +13,7 @@
android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_contacts_import.xml b/app/src/main/res/layout/activity_contacts_import.xml
index 642d3c7..5c13d88 100644
--- a/app/src/main/res/layout/activity_contacts_import.xml
+++ b/app/src/main/res/layout/activity_contacts_import.xml
@@ -13,7 +13,7 @@
android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_examination_info.xml b/app/src/main/res/layout/activity_examination_info.xml
index ac555f1..a137e43 100644
--- a/app/src/main/res/layout/activity_examination_info.xml
+++ b/app/src/main/res/layout/activity_examination_info.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_examination_info_detail.xml b/app/src/main/res/layout/activity_examination_info_detail.xml
index fefdd46..dc77bc4 100644
--- a/app/src/main/res/layout/activity_examination_info_detail.xml
+++ b/app/src/main/res/layout/activity_examination_info_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_family_assets.xml b/app/src/main/res/layout/activity_family_assets.xml
index 1a24445..5628ff5 100644
--- a/app/src/main/res/layout/activity_family_assets.xml
+++ b/app/src/main/res/layout/activity_family_assets.xml
@@ -14,7 +14,7 @@
android:id="@+id/parentLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_family_assets_detail.xml b/app/src/main/res/layout/activity_family_assets_detail.xml
index 934a442..17844ce 100644
--- a/app/src/main/res/layout/activity_family_assets_detail.xml
+++ b/app/src/main/res/layout/activity_family_assets_detail.xml
@@ -13,7 +13,7 @@
tools:context=".ui.function.FamilyMemorabiliaDetailActivity"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_family_memorabilia.xml b/app/src/main/res/layout/activity_family_memorabilia.xml
index 5533cfe..956a592 100644
--- a/app/src/main/res/layout/activity_family_memorabilia.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia.xml
@@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.function.FamilyMemorabiliaActivity"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_family_memorabilia_detail.xml b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
index e6b5232..4f038a2 100644
--- a/app/src/main/res/layout/activity_family_memorabilia_detail.xml
+++ b/app/src/main/res/layout/activity_family_memorabilia_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_genealogy.xml b/app/src/main/res/layout/activity_genealogy.xml
index 81e7ff5..da7e735 100644
--- a/app/src/main/res/layout/activity_genealogy.xml
+++ b/app/src/main/res/layout/activity_genealogy.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_growth_experience.xml b/app/src/main/res/layout/activity_growth_experience.xml
index 0bd2932..7cc6917 100644
--- a/app/src/main/res/layout/activity_growth_experience.xml
+++ b/app/src/main/res/layout/activity_growth_experience.xml
@@ -11,7 +11,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -511,7 +511,7 @@
android:id="@+id/rv_relationship"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
tools:itemCount="3"
tools:listitem="@layout/item_growth_experience_relationship" />
</LinearLayout>
diff --git a/app/src/main/res/layout/activity_health_care.xml b/app/src/main/res/layout/activity_health_care.xml
index b464bed..91c9696 100644
--- a/app/src/main/res/layout/activity_health_care.xml
+++ b/app/src/main/res/layout/activity_health_care.xml
@@ -13,7 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_home_devices.xml b/app/src/main/res/layout/activity_home_devices.xml
index e423f57..e3b911c 100644
--- a/app/src/main/res/layout/activity_home_devices.xml
+++ b/app/src/main/res/layout/activity_home_devices.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_home_devices_detail.xml b/app/src/main/res/layout/activity_home_devices_detail.xml
index 79963f6..3f7ce69 100644
--- a/app/src/main/res/layout/activity_home_devices_detail.xml
+++ b/app/src/main/res/layout/activity_home_devices_detail.xml
@@ -13,7 +13,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_honor_collection.xml b/app/src/main/res/layout/activity_honor_collection.xml
index 3c49b2e..0a8f773 100644
--- a/app/src/main/res/layout/activity_honor_collection.xml
+++ b/app/src/main/res/layout/activity_honor_collection.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_honor_collection_detail.xml b/app/src/main/res/layout/activity_honor_collection_detail.xml
index 96b7332..64b64b9 100644
--- a/app/src/main/res/layout/activity_honor_collection_detail.xml
+++ b/app/src/main/res/layout/activity_honor_collection_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_hundred_wish_detail.xml b/app/src/main/res/layout/activity_hundred_wish_detail.xml
index 393677c..e26413a 100644
--- a/app/src/main/res/layout/activity_hundred_wish_detail.xml
+++ b/app/src/main/res/layout/activity_hundred_wish_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_image_select.xml b/app/src/main/res/layout/activity_image_select.xml
index f022d89..b084895 100644
--- a/app/src/main/res/layout/activity_image_select.xml
+++ b/app/src/main/res/layout/activity_image_select.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_income_and_expenses.xml b/app/src/main/res/layout/activity_income_and_expenses.xml
index 2a0f6d9..68b002b 100644
--- a/app/src/main/res/layout/activity_income_and_expenses.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_income_and_expenses_detail.xml b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
index 0c11f37..e20bab9 100644
--- a/app/src/main/res/layout/activity_income_and_expenses_detail.xml
+++ b/app/src/main/res/layout/activity_income_and_expenses_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_little_doctor.xml b/app/src/main/res/layout/activity_little_doctor.xml
index c7e06ee..b0bf8a9 100644
--- a/app/src/main/res/layout/activity_little_doctor.xml
+++ b/app/src/main/res/layout/activity_little_doctor.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_little_doctor_detail.xml b/app/src/main/res/layout/activity_little_doctor_detail.xml
index dffe5f4..f735267 100644
--- a/app/src/main/res/layout/activity_little_doctor_detail.xml
+++ b/app/src/main/res/layout/activity_little_doctor_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 75361b6..9bf5c2d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingHorizontal="30dp"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<androidx.constraintlayout.widget.ConstraintLayout
@@ -53,7 +53,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
- android:background="@drawable/bg_login_zhang"
app:imageUrl="@{viewModel.selectLoginBackgroundLiveData}"
android:scaleType="centerCrop"
/>
@@ -64,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="15dp"
- android:text="娆㈣繋鏉ュ埌寮犳皬APP"
+ android:text="娆㈣繋鏉ュ埌鏈兘閮藉缃�"
android:textColor="@color/black"
android:textSize="20sp"
android:textStyle="bold" />
diff --git a/app/src/main/res/layout/activity_login_bg_change.xml b/app/src/main/res/layout/activity_login_bg_change.xml
index f7b3707..117181d 100644
--- a/app/src/main/res/layout/activity_login_bg_change.xml
+++ b/app/src/main/res/layout/activity_login_bg_change.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index a172f91..64a75df 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -13,6 +13,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/main_vp"
android:layout_width="match_parent"
@@ -28,7 +30,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- android:background="@color/white"
+ android:background="?attr/bottomNavigationViewBackgroundColor"
app:itemBackground="@null"
app:itemIconTint="@null"
app:itemTextAppearanceActive="@style/bottom_navigation_title_active"
diff --git a/app/src/main/res/layout/activity_marriage.xml b/app/src/main/res/layout/activity_marriage.xml
index ae01890..1c57c96 100644
--- a/app/src/main/res/layout/activity_marriage.xml
+++ b/app/src/main/res/layout/activity_marriage.xml
@@ -13,7 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_personal_notepad.xml b/app/src/main/res/layout/activity_personal_notepad.xml
index 183a1d9..5c34495 100644
--- a/app/src/main/res/layout/activity_personal_notepad.xml
+++ b/app/src/main/res/layout/activity_personal_notepad.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_personal_notepad_detail.xml b/app/src/main/res/layout/activity_personal_notepad_detail.xml
index e784511..0016be6 100644
--- a/app/src/main/res/layout/activity_personal_notepad_detail.xml
+++ b/app/src/main/res/layout/activity_personal_notepad_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_pet.xml b/app/src/main/res/layout/activity_pet.xml
index 12bfba3..de5d698 100644
--- a/app/src/main/res/layout/activity_pet.xml
+++ b/app/src/main/res/layout/activity_pet.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_pet_detail.xml b/app/src/main/res/layout/activity_pet_detail.xml
index df08189..8f3c2e2 100644
--- a/app/src/main/res/layout/activity_pet_detail.xml
+++ b/app/src/main/res/layout/activity_pet_detail.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_pet_memo_detail.xml b/app/src/main/res/layout/activity_pet_memo_detail.xml
index b5a9868..1701cf8 100644
--- a/app/src/main/res/layout/activity_pet_memo_detail.xml
+++ b/app/src/main/res/layout/activity_pet_memo_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_privacy.xml b/app/src/main/res/layout/activity_privacy.xml
index 19cda63..547120e 100644
--- a/app/src/main/res/layout/activity_privacy.xml
+++ b/app/src/main/res/layout/activity_privacy.xml
@@ -12,7 +12,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="?attr/pageBackgroundColor"
+ >
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
diff --git a/app/src/main/res/layout/activity_privacy_detail.xml b/app/src/main/res/layout/activity_privacy_detail.xml
index 59671d3..2198d52 100644
--- a/app/src/main/res/layout/activity_privacy_detail.xml
+++ b/app/src/main/res/layout/activity_privacy_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_property.xml b/app/src/main/res/layout/activity_property.xml
index 0dcfb0e..ad8697f 100644
--- a/app/src/main/res/layout/activity_property.xml
+++ b/app/src/main/res/layout/activity_property.xml
@@ -12,7 +12,9 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:background="?attr/pageBackgroundColor"
+ >
<com.android.app_base.widget.ExtendTitleBar
android:id="@+id/titleBar"
diff --git a/app/src/main/res/layout/activity_property_detail.xml b/app/src/main/res/layout/activity_property_detail.xml
index 05cad7a..aef9b20 100644
--- a/app/src/main/res/layout/activity_property_detail.xml
+++ b/app/src/main/res/layout/activity_property_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_tourism.xml b/app/src/main/res/layout/activity_tourism.xml
index 827314e..b91df1f 100644
--- a/app/src/main/res/layout/activity_tourism.xml
+++ b/app/src/main/res/layout/activity_tourism.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ui.function.FamilyMemorabiliaActivity"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_tourism_detail.xml b/app/src/main/res/layout/activity_tourism_detail.xml
index 016b005..1215929 100644
--- a/app/src/main/res/layout/activity_tourism_detail.xml
+++ b/app/src/main/res/layout/activity_tourism_detail.xml
@@ -12,7 +12,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/detailPageBackgroundColor"
android:orientation="vertical">
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/activity_tourism_experience.xml b/app/src/main/res/layout/activity_tourism_experience.xml
index 3f2847e..f30770d 100644
--- a/app/src/main/res/layout/activity_tourism_experience.xml
+++ b/app/src/main/res/layout/activity_tourism_experience.xml
@@ -12,7 +12,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
diff --git a/app/src/main/res/layout/dialog_toatal_add.xml b/app/src/main/res/layout/dialog_toatal_add.xml
index 2ed5aa6..e03fe81 100644
--- a/app/src/main/res/layout/dialog_toatal_add.xml
+++ b/app/src/main/res/layout/dialog_toatal_add.xml
@@ -57,7 +57,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_notes"
+ android:src="@drawable/ic_function_notes"
android:layout_gravity="center_vertical" />
<TextView
@@ -88,7 +88,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_home_devices"
+ android:src="@drawable/ic_function_home_devices"
android:layout_gravity="center_vertical" />
<TextView
@@ -119,7 +119,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_little_doctor"
+ android:src="@drawable/ic_function_little_doctor"
android:layout_gravity="center_vertical" />
<TextView
@@ -150,7 +150,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_cleaning"
+ android:src="@drawable/ic_function_cleaning"
android:layout_gravity="center_vertical" />
<TextView
@@ -181,7 +181,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_income_expense"
+ android:src="@drawable/ic_function_income_expense"
android:layout_gravity="center_vertical" />
<TextView
@@ -214,7 +214,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_health"
+ android:src="@drawable/ic_function_health"
android:layout_gravity="center_vertical" />
<TextView
@@ -245,7 +245,7 @@
<ImageView
android:layout_width="18dp"
android:layout_height="18dp"
- android:src="@drawable/function_tour"
+ android:src="@drawable/ic_function_tour"
android:layout_gravity="center_vertical" />
<TextView
diff --git a/app/src/main/res/layout/dialog_version_update.xml b/app/src/main/res/layout/dialog_version_update.xml
deleted file mode 100644
index 2b5cb7c..0000000
--- a/app/src/main/res/layout/dialog_version_update.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center">
- <LinearLayout
- android:layout_width="275dp"
- android:layout_height="wrap_content"
- android:background="@color/color_normal_background"
- android:orientation="vertical"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="鏂扮増鏈�"
- android:textSize="@dimen/sp_24"
- android:textStyle="bold"
- android:textColor="#FF3560F4"
- android:layout_gravity="center"
- android:layout_marginTop="20dp"
- />
- <TextView
- android:id="@+id/tv_update_dialog_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="蹇潵鏇存柊鍟"
- android:textSize="24sp"
- android:textStyle="bold"
- android:textColor="#FF3560F4"
- android:layout_gravity="center"
- android:layout_marginTop="10dp"
- />
- <TextView
- android:id="@+id/tv_update_dialog_content"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="淇淇"
- android:textSize="14sp"
- android:textColor="@color/black"
- android:layout_gravity="center"
- android:gravity="center"
- android:layout_marginTop="20dp"
- android:layout_marginHorizontal="30dp"
- />
- <androidx.cardview.widget.CardView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="20dp"
- android:layout_gravity="center"
- app:cardCornerRadius="10dp"
- app:cardBackgroundColor="@color/color_FFF08EBA_text_pink"
- >
- <TextView
- android:id="@+id/tv_update_dialog_confirm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="绔嬪嵆鏇存柊"
- android:textSize="16sp"
- android:textStyle="bold"
- android:textColor="@color/white"
- android:gravity="center"
- android:paddingHorizontal="20dp"
- android:paddingVertical="3dp"
- />
- </androidx.cardview.widget.CardView>
-
-
- <RelativeLayout
- android:layout_marginVertical="@dimen/dp_24"
- android:id="@+id/layout_progress"
- android:layout_marginHorizontal="@dimen/dp_16"
- android:gravity="center_vertical"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <ProgressBar
- android:id="@+id/pb_download"
- style="@android:style/Widget.ProgressBar.Horizontal"
- android:layout_width="match_parent"
- android:layout_height="15dp"
- android:max="100"
- android:progressDrawable="@drawable/shape_gradient_update_progress"
- />
-
- <TextView
- android:layout_below="@+id/pb_download"
- android:textColor="#999999"
- android:text="0%"
- android:textSize="14sp"
- android:id="@+id/tv_pro"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
- <TextView
- android:layout_alignParentRight="true"
- android:layout_below="@+id/pb_download"
- android:textColor="#999999"
- android:text="0/100"
- android:textSize="14sp"
- android:id="@+id/tv_pro_percent"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
- </RelativeLayout>
-
-
- </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_function.xml b/app/src/main/res/layout/fragment_function.xml
index 3bdd176..1712a99 100644
--- a/app/src/main/res/layout/fragment_function.xml
+++ b/app/src/main/res/layout/fragment_function.xml
@@ -15,7 +15,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
android:orientation="vertical"
>
<com.android.app_base.widget.ExtendTitleBar
@@ -63,7 +63,7 @@
android:id="@+id/layout_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/color_card_pink"
+ android:background="?attr/pageBackgroundColor"
>
<ImageView
android:id="@+id/iv_banner"
@@ -118,15 +118,14 @@
android:id="@+id/tv_core_module"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="@dimen/dp_20"
- android:layout_marginTop="@dimen/dp_20"
+ android:layout_marginStart="20dp"
+ android:layout_marginTop="20dp"
android:text="鏍稿績妯″潡"
android:textColor="@color/black"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
<LinearLayout
android:id="@+id/layout_home_root_net"
android:layout_width="wrap_content"
@@ -141,7 +140,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_family_root_net" />
+ android:background="?attr/icFunctionFamilyRootNet"
+ />
<TextView
android:layout_width="wrap_content"
@@ -164,7 +164,7 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_notes" />
+ android:background="?attr/icFunctionNotes" />
<TextView
android:layout_width="wrap_content"
@@ -187,7 +187,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_asset" />
+ android:background="?attr/icFunctionAsset" />
<TextView
android:layout_width="wrap_content"
@@ -210,7 +210,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_honor" />
+ android:background="?attr/icFunctionHonor" />
<TextView
android:layout_width="wrap_content"
@@ -236,7 +236,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_little_doctor"
+ android:background="?attr/icFunctionLittleDoctor"
/>
<TextView
android:layout_width="wrap_content"
@@ -261,7 +261,7 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_cleaning"
+ android:background="?attr/icFunctionCleaning"
/>
<TextView
android:layout_width="wrap_content"
@@ -285,7 +285,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_mail_list" />
+ android:background="?attr/icFunctionMailList"
+ />
<TextView
android:layout_width="wrap_content"
@@ -308,7 +309,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_pamper_pet" />
+ android:background="?attr/icFunctionPamperPet"
+ />
<TextView
android:layout_width="wrap_content"
@@ -333,7 +335,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_income_expense" />
+ android:background="?attr/icFunctionIncomeExpense"
+ />
<TextView
android:layout_width="wrap_content"
@@ -357,7 +360,8 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/function_home_devices" />
+ android:background="?attr/icFunctionHomeDevices"
+ />
<TextView
android:layout_width="wrap_content"
@@ -394,7 +398,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_growth" />
+ android:background="?attr/icFunctionGrowth"
+ />
<TextView
android:layout_width="wrap_content"
@@ -417,7 +422,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_marriage" />
+ android:background="?attr/icFunctionMarriage"
+ />
<TextView
android:layout_width="wrap_content"
@@ -441,7 +447,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_property"/>
+ android:background="?attr/icFunctionProperty"
+ />
<TextView
android:layout_width="wrap_content"
@@ -464,7 +471,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_wish"/>
+ android:background="?attr/icFunctionWish"
+ />
<TextView
android:layout_width="wrap_content"
@@ -489,7 +497,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_tour" />
+ android:background="?attr/icFunctionTour"
+ />
<TextView
android:layout_width="wrap_content"
@@ -513,7 +522,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_health" />
+ android:background="?attr/icFunctionHealth"
+ />
<TextView
android:layout_width="wrap_content"
@@ -537,7 +547,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_honor" />
+ android:background="?attr/icFunctionCertificate"
+ />
<TextView
android:layout_width="wrap_content"
@@ -561,7 +572,8 @@
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
- android:background="@drawable/function_privacy" />
+ android:background="?attr/icFunctionPrivacy"
+ />
<TextView
android:layout_width="wrap_content"
@@ -578,7 +590,7 @@
android:id="@+id/fab_add"
android:layout_width="56dp"
android:layout_height="56dp"
- android:layout_gravity="end | bottom"
+ android:layout_gravity="end|bottom"
android:layout_marginEnd="25dp"
android:layout_marginBottom="44dp"
android:src="@drawable/ic_add"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index be0ed04..b6de99b 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -38,42 +38,57 @@
</FrameLayout>
</com.android.app_base.widget.ExtendTitleBar>
- <com.otaliastudios.zoom.ZoomLayout
- android:id="@+id/zoomLayout"
+ <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:scrollbars="vertical|horizontal"
- app:transformation="centerInside"
- app:transformationGravity="auto"
- app:alignment="center"
- app:overScrollHorizontal="true"
- app:overScrollVertical="true"
- app:overPinchable="true"
- app:horizontalPanEnabled="true"
- app:verticalPanEnabled="true"
- app:zoomEnabled="true"
- app:flingEnabled="true"
- app:scrollEnabled="true"
- app:oneFingerScrollEnabled="true"
- app:twoFingersScrollEnabled="true"
- app:threeFingersScrollEnabled="true"
- app:minZoom="1"
- app:minZoomType="zoom"
- app:maxZoom="2.5"
- app:maxZoomType="realZoom"
- app:animationDuration="280"
- app:hasClickableChildren="true"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
-
- <com.application.zhangshi_app_android.widget.HomeMindMapLayout
- android:id="@+id/scrollHomeMindMapLayout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ <ImageView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:src="@drawable/bg_login_zhang"
+ android:scaleType="fitCenter"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
/>
- </com.otaliastudios.zoom.ZoomLayout>
+ <com.otaliastudios.zoom.ZoomLayout
+ android:id="@+id/zoomLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="vertical|horizontal"
+ app:transformation="centerInside"
+ app:transformationGravity="auto"
+ app:alignment="center"
+ app:overScrollHorizontal="true"
+ app:overScrollVertical="true"
+ app:overPinchable="true"
+ app:horizontalPanEnabled="true"
+ app:verticalPanEnabled="true"
+ app:zoomEnabled="true"
+ app:flingEnabled="true"
+ app:scrollEnabled="true"
+ app:oneFingerScrollEnabled="true"
+ app:twoFingersScrollEnabled="true"
+ app:threeFingersScrollEnabled="true"
+ app:minZoom="1"
+ app:minZoomType="zoom"
+ app:maxZoom="2.5"
+ app:maxZoomType="realZoom"
+ app:animationDuration="280"
+ app:hasClickableChildren="true"
+ >
+ <com.application.zhangshi_app_android.widget.HomeMindMapLayout
+ android:id="@+id/scrollHomeMindMapLayout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+ </com.otaliastudios.zoom.ZoomLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_personal_center.xml b/app/src/main/res/layout/fragment_personal_center.xml
index feef559..20de192 100644
--- a/app/src/main/res/layout/fragment_personal_center.xml
+++ b/app/src/main/res/layout/fragment_personal_center.xml
@@ -14,12 +14,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:background="@color/color_normal_background"
+ android:background="?attr/pageBackgroundColor"
>
<com.android.app_base.widget.ExtendTitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:title="涓汉涓績"
+ app:title="鎴戠殑"
app:titleGravity="left"
android:elevation="5dp"
>
@@ -81,8 +81,10 @@
app:layout_constraintWidth_percent="0.3"
app:roundPercent="1"
app:imageUrl="@{viewModel.infoLiveData.img}"
+ android:scaleType="centerCrop"
/>
<ImageView
+ android:id="@+id/iv_take_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/ic_camera"
@@ -279,6 +281,29 @@
android:layout_height="1dp"
android:background="#33000000"
/>
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingVertical="12dp"
+ android:paddingHorizontal="10dp"
+ android:gravity="center_vertical"
+ >
+ <TextView
+ android:layout_width="0dp"
+ android:layout_weight="1"
+ android:layout_height="wrap_content"
+ android:textSize="18sp"
+ android:textColor="#FF212121"
+ android:text="鎶ょ溂妯″紡"
+ />
+ <com.android.app_base.widget.SwitchButton
+ android:id="@+id/switchBtn"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ </LinearLayout>
+
</LinearLayout>
<TextView
android:id="@+id/tv_login_out"
diff --git a/app/src/main/res/layout/item_annual_health_status.xml b/app/src/main/res/layout/item_annual_health_status.xml
index 1531c27..53afa54 100644
--- a/app/src/main/res/layout/item_annual_health_status.xml
+++ b/app/src/main/res/layout/item_annual_health_status.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_certificate_of_honor.xml b/app/src/main/res/layout/item_certificate_of_honor.xml
index f951efc..ae3545a 100644
--- a/app/src/main/res/layout/item_certificate_of_honor.xml
+++ b/app/src/main/res/layout/item_certificate_of_honor.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_clean_storage.xml b/app/src/main/res/layout/item_clean_storage.xml
index b5fc525..f334e7d 100644
--- a/app/src/main/res/layout/item_clean_storage.xml
+++ b/app/src/main/res/layout/item_clean_storage.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_contacts.xml b/app/src/main/res/layout/item_contacts.xml
index e29fd46..52874e5 100644
--- a/app/src/main/res/layout/item_contacts.xml
+++ b/app/src/main/res/layout/item_contacts.xml
@@ -20,7 +20,7 @@
android:layout_margin="2dp"
tools:layout_height="wrap_content"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_electronic_file_add.xml b/app/src/main/res/layout/item_electronic_file_add.xml
index 722063c..c1964ad 100644
--- a/app/src/main/res/layout/item_electronic_file_add.xml
+++ b/app/src/main/res/layout/item_electronic_file_add.xml
@@ -28,7 +28,7 @@
<androidx.constraintlayout.utils.widget.ImageFilterView
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#73fab4cd"
+ android:background="?attr/electronicFileAddBackgroundColor"
app:round="10dp"
/>
<androidx.constraintlayout.utils.widget.ImageFilterView
@@ -76,16 +76,17 @@
android:layout_gravity="top|start"
/>
</FrameLayout>
- <FrameLayout
+ <androidx.cardview.widget.CardView
android:id="@+id/fl_add"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintDimensionRatio="1:1"
android:layout_margin="7dp"
+ app:layout_constraintDimensionRatio="1:1"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
- android:background="@drawable/shape_73fab4cd_solid"
-
+ app:cardCornerRadius="10dp"
+ app:cardElevation="0dp"
+ app:cardBackgroundColor="?attr/electronicFileAddBackgroundColor"
>
<ImageView
android:layout_width="wrap_content"
@@ -93,7 +94,7 @@
android:background="@drawable/ic_import_add"
android:layout_gravity="center"
/>
- </FrameLayout>
+ </androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_examination_info.xml b/app/src/main/res/layout/item_examination_info.xml
index 8d17ad4..9292894 100644
--- a/app/src/main/res/layout/item_examination_info.xml
+++ b/app/src/main/res/layout/item_examination_info.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_family_assets.xml b/app/src/main/res/layout/item_family_assets.xml
index f482322..b5994e7 100644
--- a/app/src/main/res/layout/item_family_assets.xml
+++ b/app/src/main/res/layout/item_family_assets.xml
@@ -20,7 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
tools:layout_height="wrap_content"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_family_member.xml b/app/src/main/res/layout/item_family_member.xml
index 80ea031..d5ed7a1 100644
--- a/app/src/main/res/layout/item_family_member.xml
+++ b/app/src/main/res/layout/item_family_member.xml
@@ -10,6 +10,7 @@
</data>
<androidx.cardview.widget.CardView
+ android:id="@+id/cv_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:cardCornerRadius="10dp"
@@ -17,10 +18,23 @@
app:cardBackgroundColor="@color/white"
android:layout_margin="1dp">
+ <androidx.constraintlayout.utils.widget.ImageFilterView
+ android:id="@+id/iv_myself"
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:layout_gravity="center_vertical"
+ android:layout_marginHorizontal="2dp"
+ android:background="@drawable/ic_myself"
+ app:roundPercent="1"
+ android:elevation="10dp"
+ android:visibility="gone"
+ tools:visibility="visible"
+ />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginHorizontal="10dp"
+ android:layout_marginEnd="20dp"
+ android:layout_marginStart="20dp"
android:layout_marginVertical="5dp"
android:orientation="horizontal"
android:gravity="center"
@@ -36,7 +50,8 @@
android:textColor="#FFEBA4AA"
android:gravity="center"
android:maxLines="1"
- tools:text="100"
+ tools:text="2"
+
/>
<!-- 澶村儚 -->
@@ -44,7 +59,7 @@
android:id="@+id/iv_avatar"
android:layout_width="30dp"
android:layout_height="30dp"
- android:layout_marginStart="8dp"
+ android:layout_marginStart="5dp"
android:layout_marginEnd="10dp"
android:scaleType="fitCenter"
app:roundPercent="1"
diff --git a/app/src/main/res/layout/item_family_memorabilia.xml b/app/src/main/res/layout/item_family_memorabilia.xml
index f3d03c6..5895689 100644
--- a/app/src/main/res/layout/item_family_memorabilia.xml
+++ b/app/src/main/res/layout/item_family_memorabilia.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_growth_experience_abroad_condition.xml b/app/src/main/res/layout/item_growth_experience_abroad_condition.xml
index 501d7b0..bc3495e 100644
--- a/app/src/main/res/layout/item_growth_experience_abroad_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_abroad_condition.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_growth_experience_holder_condition.xml b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
index 6cab216..d2c2190 100644
--- a/app/src/main/res/layout/item_growth_experience_holder_condition.xml
+++ b/app/src/main/res/layout/item_growth_experience_holder_condition.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_growth_experience_primary.xml b/app/src/main/res/layout/item_growth_experience_primary.xml
index 4ada7e4..cda27f2 100644
--- a/app/src/main/res/layout/item_growth_experience_primary.xml
+++ b/app/src/main/res/layout/item_growth_experience_primary.xml
@@ -20,7 +20,7 @@
tools:layout_height="wrap_content"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_growth_experience_relationship.xml b/app/src/main/res/layout/item_growth_experience_relationship.xml
index 40d8b6f..62ea91f 100644
--- a/app/src/main/res/layout/item_growth_experience_relationship.xml
+++ b/app/src/main/res/layout/item_growth_experience_relationship.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_home_devices.xml b/app/src/main/res/layout/item_home_devices.xml
index 153693d..37b0773 100644
--- a/app/src/main/res/layout/item_home_devices.xml
+++ b/app/src/main/res/layout/item_home_devices.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_home_member_list.xml b/app/src/main/res/layout/item_home_member_list.xml
index 49f0788..944f1ce 100644
--- a/app/src/main/res/layout/item_home_member_list.xml
+++ b/app/src/main/res/layout/item_home_member_list.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
app:cardElevation="0dp"
tools:layout_height="wrap_content"
>
diff --git a/app/src/main/res/layout/item_honor_collection.xml b/app/src/main/res/layout/item_honor_collection.xml
index dad90ec..67c38ff 100644
--- a/app/src/main/res/layout/item_honor_collection.xml
+++ b/app/src/main/res/layout/item_honor_collection.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_hundred_wish.xml b/app/src/main/res/layout/item_hundred_wish.xml
index 00fc6d2..1c57491 100644
--- a/app/src/main/res/layout/item_hundred_wish.xml
+++ b/app/src/main/res/layout/item_hundred_wish.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_income_and_expenses.xml b/app/src/main/res/layout/item_income_and_expenses.xml
index 02e3c0c..cbb1a3c 100644
--- a/app/src/main/res/layout/item_income_and_expenses.xml
+++ b/app/src/main/res/layout/item_income_and_expenses.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_little_doctor.xml b/app/src/main/res/layout/item_little_doctor.xml
index 7c08c91..b083eec 100644
--- a/app/src/main/res/layout/item_little_doctor.xml
+++ b/app/src/main/res/layout/item_little_doctor.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -38,7 +38,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_personal_notepad.xml b/app/src/main/res/layout/item_personal_notepad.xml
index 39f15f1..dd8fe5f 100644
--- a/app/src/main/res/layout/item_personal_notepad.xml
+++ b/app/src/main/res/layout/item_personal_notepad.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_pet.xml b/app/src/main/res/layout/item_pet.xml
index 363d416..2760f4d 100644
--- a/app/src/main/res/layout/item_pet.xml
+++ b/app/src/main/res/layout/item_pet.xml
@@ -20,7 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
tools:layout_height="wrap_content"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:background="@drawable/ic_flower"
+ android:background="?attr/icIsOwnFamilyDataFlower"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_pet_memo.xml b/app/src/main/res/layout/item_pet_memo.xml
index 3611836..ffd4475 100644
--- a/app/src/main/res/layout/item_pet_memo.xml
+++ b/app/src/main/res/layout/item_pet_memo.xml
@@ -20,7 +20,7 @@
android:layout_margin="@dimen/dp_2"
tools:layout_height="wrap_content"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_privacy.xml b/app/src/main/res/layout/item_privacy.xml
index dcc41af..64cd944 100644
--- a/app/src/main/res/layout/item_privacy.xml
+++ b/app/src/main/res/layout/item_privacy.xml
@@ -20,7 +20,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
diff --git a/app/src/main/res/layout/item_property.xml b/app/src/main/res/layout/item_property.xml
index 5bcb8b8..519b2a8 100644
--- a/app/src/main/res/layout/item_property.xml
+++ b/app/src/main/res/layout/item_property.xml
@@ -20,7 +20,7 @@
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
tools:layout_height="wrap_content"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
>
<LinearLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_tourism.xml b/app/src/main/res/layout/item_tourism.xml
index b8bda6c..98b8ec8 100644
--- a/app/src/main/res/layout/item_tourism.xml
+++ b/app/src/main/res/layout/item_tourism.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/item_tourism_experience.xml b/app/src/main/res/layout/item_tourism_experience.xml
index b229a41..cc6a03a 100644
--- a/app/src/main/res/layout/item_tourism_experience.xml
+++ b/app/src/main/res/layout/item_tourism_experience.xml
@@ -19,7 +19,7 @@
android:layout_height="40dp"
android:layout_margin="@dimen/dp_2"
app:cardCornerRadius="@dimen/dp_10"
- app:cardBackgroundColor="@color/color_card_pink"
+ app:cardBackgroundColor="?attr/cardBackgroundColorFirst"
tools:layout_height="wrap_content"
>
<LinearLayout
@@ -39,7 +39,7 @@
android:layout_height="18dp"
android:layout_marginStart="3dp"
android:layout_centerVertical="true"
- android:button="@drawable/selector_checkbox"
+ android:button="?attr/checkboxSelector"
android:background="?selectableItemBackgroundBorderless"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
diff --git a/app/src/main/res/layout/layout_drawer.xml b/app/src/main/res/layout/layout_drawer.xml
index 0511593..f61c45c 100644
--- a/app/src/main/res/layout/layout_drawer.xml
+++ b/app/src/main/res/layout/layout_drawer.xml
@@ -5,7 +5,7 @@
android:layout_width="211dp"
android:layout_height="match_parent"
android:layout_gravity="start"
- android:background="@color/color_card_pink"
+ android:background="?attr/drawerBackgroundColor"
android:paddingTop="25dp"
>
<LinearLayout
@@ -26,6 +26,7 @@
android:id="@+id/dl_home_user_avatar"
android:layout_width="50dp"
android:layout_height="50dp"
+ android:scaleType="centerCrop"
app:roundPercent="1"
/>
<TextView
@@ -40,7 +41,7 @@
</LinearLayout>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
- android:layout_height="304dp"
+ android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
@@ -58,6 +59,7 @@
android:textColor="@color/black"
android:textSize="12sp"
android:layout_marginStart="14dp"
+ android:layout_marginBottom="8dp"
/>
<View
android:layout_width="match_parent"
@@ -70,12 +72,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_family_root_net"
+ android:layout_width="13dp"
+ android:layout_height="10dp"
+ android:background="?attr/icFunctionFamilyRootNet"
/>
<TextView
android:layout_width="0dp"
@@ -98,12 +101,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_notes"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:background="?attr/icFunctionNotes"
/>
<TextView
android:layout_width="0dp"
@@ -126,12 +130,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_asset"
+ android:layout_width="13dp"
+ android:layout_height="14dp"
+ android:background="?attr/icFunctionAsset"
/>
<TextView
android:layout_width="0dp"
@@ -154,12 +159,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_home_devices"
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:background="?attr/icFunctionHomeDevices"
/>
<TextView
@@ -183,12 +189,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_honor"
+ android:layout_width="13dp"
+ android:layout_height="12dp"
+ android:background="?attr/icFunctionHonor"
/>
<TextView
android:layout_width="0dp"
@@ -211,12 +218,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_little_doctor"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:background="?attr/icFunctionLittleDoctor"
/>
<TextView
android:layout_width="0dp"
@@ -239,12 +247,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_cleaning"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:background="?attr/icFunctionCleaning"
/>
<TextView
android:layout_width="0dp"
@@ -267,12 +276,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_mail_list"
+ android:layout_width="13dp"
+ android:layout_height="14dp"
+ android:background="?attr/icFunctionMailList"
/>
<TextView
android:layout_width="0dp"
@@ -295,12 +305,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_pet"
+ android:layout_width="13dp"
+ android:layout_height="10dp"
+ android:background="?attr/icFunctionPamperPet"
/>
<TextView
android:layout_width="0dp"
@@ -323,12 +334,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_income_expense"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:background="?attr/icFunctionIncomeExpense"
/>
<TextView
android:layout_width="0dp"
@@ -351,7 +363,7 @@
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
- android:layout_height="240dp"
+ android:layout_height="wrap_content"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
@@ -362,6 +374,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
+ android:paddingVertical="8dp"
>
<TextView
android:layout_width="wrap_content"
@@ -369,7 +382,7 @@
android:text="涓汉鏉垮潡"
android:textColor="@color/black"
android:textSize="12sp"
- android:layout_marginVertical="8dp"
+ android:layout_marginBottom="8dp"
android:layout_marginStart="14dp"
/>
<View
@@ -383,12 +396,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_growth"
+ android:layout_width="13dp"
+ android:layout_height="16dp"
+ android:background="?attr/icFunctionGrowth"
/>
<TextView
android:layout_width="0dp"
@@ -411,12 +425,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_marriage"
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:background="?attr/icFunctionMarriage"
/>
<TextView
android:layout_width="0dp"
@@ -439,12 +454,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_property"
+ android:layout_width="13dp"
+ android:layout_height="16dp"
+ android:background="?attr/icFunctionProperty"
/>
<TextView
android:layout_width="0dp"
@@ -467,12 +483,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_wish"
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:background="?attr/icFunctionWish"
/>
<TextView
android:layout_width="0dp"
@@ -495,12 +512,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_tour"
+ android:layout_width="13dp"
+ android:layout_height="13dp"
+ android:background="?attr/icFunctionTour"
/>
<TextView
android:layout_width="0dp"
@@ -523,13 +541,14 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_health" />
+ android:layout_width="13dp"
+ android:layout_height="12dp"
+ android:background="?attr/icFunctionHealth" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -551,12 +570,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_certificate"
+ android:layout_width="13dp"
+ android:layout_height="14dp"
+ android:background="?attr/icFunctionCertificate"
/>
<TextView
android:layout_width="0dp"
@@ -579,12 +599,13 @@
android:layout_height="0dp"
android:layout_weight="1"
android:paddingHorizontal="15dp"
+ android:layout_marginVertical="3dp"
android:gravity="center"
>
<ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/ic_privacy"
+ android:layout_width="13dp"
+ android:layout_height="15dp"
+ android:background="?attr/icFunctionPrivacy"
/>
<TextView
android:layout_width="0dp"
diff --git a/app/src/main/res/layout/pop_annual_health_status.xml b/app/src/main/res/layout/pop_annual_health_status.xml
index 5df77f0..8da2c30 100644
--- a/app/src/main/res/layout/pop_annual_health_status.xml
+++ b/app/src/main/res/layout/pop_annual_health_status.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_contacts_import.xml b/app/src/main/res/layout/pop_contacts_import.xml
index cc35a1b..4f8ff96 100644
--- a/app/src/main/res/layout/pop_contacts_import.xml
+++ b/app/src/main/res/layout/pop_contacts_import.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_operate.xml b/app/src/main/res/layout/pop_operate.xml
index 035f4dd..eda3e8f 100644
--- a/app/src/main/res/layout/pop_operate.xml
+++ b/app/src/main/res/layout/pop_operate.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_operate_delete.xml b/app/src/main/res/layout/pop_operate_delete.xml
index f0024eb..5595d0f 100644
--- a/app/src/main/res/layout/pop_operate_delete.xml
+++ b/app/src/main/res/layout/pop_operate_delete.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:text="鍒犻櫎"
android:gravity="center"
- android:textColor="#FF333333"
+ android:textColor="#FFE86F72"
android:textSize="12sp"
app:drawableStartCompat="@drawable/ic_delete"
android:drawablePadding="5dp"
diff --git a/app/src/main/res/layout/pop_operate_exam_info.xml b/app/src/main/res/layout/pop_operate_exam_info.xml
index 04d4b69..1e5e191 100644
--- a/app/src/main/res/layout/pop_operate_exam_info.xml
+++ b/app/src/main/res/layout/pop_operate_exam_info.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_operate_home_root_net.xml b/app/src/main/res/layout/pop_operate_home_root_net.xml
index 55172ab..f757234 100644
--- a/app/src/main/res/layout/pop_operate_home_root_net.xml
+++ b/app/src/main/res/layout/pop_operate_home_root_net.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_operate_person_center.xml b/app/src/main/res/layout/pop_operate_person_center.xml
index fe9de37..1714e6d 100644
--- a/app/src/main/res/layout/pop_operate_person_center.xml
+++ b/app/src/main/res/layout/pop_operate_person_center.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_operate_pet.xml b/app/src/main/res/layout/pop_operate_pet.xml
index 3e5d2c1..a0475db 100644
--- a/app/src/main/res/layout/pop_operate_pet.xml
+++ b/app/src/main/res/layout/pop_operate_pet.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_personal_notepad.xml b/app/src/main/res/layout/pop_personal_notepad.xml
index 1fb60aa..3651b42 100644
--- a/app/src/main/res/layout/pop_personal_notepad.xml
+++ b/app/src/main/res/layout/pop_personal_notepad.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/layout/pop_switch_video_or_image.xml b/app/src/main/res/layout/pop_switch_video_or_image.xml
index a837088..6ef33c3 100644
--- a/app/src/main/res/layout/pop_switch_video_or_image.xml
+++ b/app/src/main/res/layout/pop_switch_video_or_image.xml
@@ -4,7 +4,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- app:cardBackgroundColor="#FFFAD1E0"
+ app:cardBackgroundColor="?attr/popupWindowBackgroundColor"
app:cardCornerRadius="10dp"
app:cardElevation="0dp"
>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index 73a4c46..df64e99 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/navigation_home"
android:icon="@drawable/selector_bottom_navigation_home"
- android:title="@string/title_home" />
-
+ android:title="@string/title_home"
+ />
<item
- android:id="@+id/navigation_function"
- android:icon="@drawable/selector_bottom_navigation_function"
- android:title="@string/title_function" />
+ android:id="@+id/navigation_tree"
+ android:icon="@drawable/selector_bottom_navigation_tree"
+ android:title="@string/title_tree"
+ />
<item
android:id="@+id/navigation_personal_center"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 0000000..65984bf
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <declare-styleable name="AppTheme">
+ <attr name="pageBackgroundColor" format="reference|color" />
+ <attr name="detailPageBackgroundColor" format="reference|color" />
+ <attr name="titleBarBackgroundColor" format="reference|color" />
+ <attr name="bottomNavigationViewBackgroundColor" format="reference|color" />
+ <attr name="text_color_main" format="reference|color" />
+ <attr name="menuIconHome" format="reference" />
+ <attr name="menuIconTree" format="reference" />
+ <attr name="menuIconUser" format="reference" />
+
+ <attr name="icFunctionFamilyRootNet" format="reference" />
+ <attr name="icFunctionNotes" format="reference" />
+ <attr name="icFunctionAsset" format="reference" />
+ <attr name="icFunctionHonor" format="reference" />
+ <attr name="icFunctionLittleDoctor" format="reference" />
+ <attr name="icFunctionCleaning" format="reference" />
+ <attr name="icFunctionMailList" format="reference" />
+ <attr name="icFunctionPamperPet" format="reference" />
+ <attr name="icFunctionIncomeExpense" format="reference" />
+ <attr name="icFunctionHomeDevices" format="reference" />
+ <attr name="icFunctionGrowth" format="reference" />
+ <attr name="icFunctionMarriage" format="reference" />
+ <attr name="icFunctionProperty" format="reference" />
+ <attr name="icFunctionWish" format="reference" />
+ <attr name="icFunctionTour" format="reference" />
+ <attr name="icFunctionHealth" format="reference" />
+ <attr name="icFunctionCertificate" format="reference" />
+ <attr name="icFunctionPrivacy" format="reference" />
+
+ <attr name="cardBackgroundColorFirst" format="reference|color"/>
+ <attr name="cardBackgroundColorSecond" format="reference|color"/>
+
+ <attr name="drawerBackgroundColor" format="reference|color" />
+ <attr name="drawerTextColor" format="reference|color" />
+ <attr name="drawerSelectIcon" format="reference" />
+
+ <attr name="icIsOwnFamilyDataFlower" format="reference" />
+
+ <attr name="icUnfold" format="reference"/>
+ <attr name="icFold" format="reference"/>
+
+ <attr name="popupWindowBackgroundColor" format="reference|color" />
+
+ <attr name="electronicFileAddBackgroundColor" format="reference|color" />"
+
+ <attr name="icPdf" format="reference" />
+ <attr name="icWord" format="reference" />
+ <attr name="icExcel" format="reference" />
+ <attr name="icPpt" format="reference" />
+ <attr name="icTxt" format="reference" />
+ <attr name="icOther" format="reference" />
+ <attr name="icZip" format="reference" />
+ <attr name="icVideo" format="reference" />
+ <attr name="icAudio" format="reference" />
+ <attr name="icImage" format="reference" />
+
+ <attr name="checkboxSelector" format="reference" />
+ </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 6281205..ab67e33 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,21 +9,54 @@
<color name="white">#FFFFFFFF</color>
<!-- App 鏍峰紡涓紩鐢ㄧ殑棰滆壊 -->
- <color name="colorPrimary">@color/color_main</color>
+ <color name="colorPrimary">#FFF08EBA</color>
<color name="colorPrimaryDark">@color/black</color>
<color name="colorAccent">#FFF08EBA</color>
<color name="windowBackground">#F4F4F4</color>
<color name="transparent">#00000000</color>
- <color name="color_main">#FFF08EBA</color>
+
+ <color name="color_normal_main">#FFF08EBA</color>
+ <color name="color_night_main">#FF61B15A</color>
+
<color name="color_normal_background">#FFFEF7FC</color>
- <color name="color_title_bar_background">#FFF08EBA</color>
+ <color name="color_night_background">#FFADCE74</color>
+
+ <color name="color_normal_detail_page_background">#FFFEF7FC</color>
+ <color name="color_night_detail_page_background">#B3ADCE74</color>
+
+ <color name="color_normal_title_bar_background">#FFF08EBA</color>
+ <color name="color_night_title_bar_background">#FF61B15A</color>
+
+ <color name="color_normal_bottom_navigation_view_background">#FFFFFFFF</color>
+ <color name="color_night_bottom_navigation_view_background">#FFFFFFE8</color>
+
<color name="color_FFF08EBA_text_pink">#FFF08EBA</color>
+ <color name="color_FF4E9F3D_text_green">#FF4E9F3D</color>
+
<color name="color_FF666666_text_default">#FF666666</color>
+
<color name="color_card_pink">#FFFFE2EF</color>
+ <color name="color_card_yellow">#FFFFF76A</color>
+
<color name="color_card_blue">#FFE0EEFE</color>
+ <color name="color_card_orange">#FFFFCE89</color>
+
<color name="color_card_green">#FFEBFFF2</color>
+
+ <color name="color_normal_drawer_bg">#FFFFE2EF</color>
+ <color name="color_night_drawer_bg">#FFADCE74</color>
+
+ <color name="color_normal_drawer_text_color">#FFF6739F</color>
+ <color name="color_night_drawer_text_color">#FF004225</color>
+
+ <color name="color_normal_popup_window_bg">#FFFAD1E0</color>
+ <color name="color_night_popup_window_bg">#FFBEE181</color>
+
+ <color name="color_normal_electronic_file_add_bg">#73FAB4CD</color>"
+ <color name="color_night_electronic_file_add_bg">#FFADCE74</color>
+
<color name="color_shadow">#88666666</color>
<color name="color_non_editable">#AAf5f7fa</color>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0783d36..db74bf4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,9 +2,10 @@
<string name="app_name">鏈兘閮藉缃�</string>
<string name="title_home">棣栭〉</string>
+ <string name="title_tree">瀹跺浘</string>
<string name="title_function">鍔熻兘</string>
<string name="title_family_memorabilia">瀹跺ぇ浜嬭</string>
- <string name="title_personal_center">涓汉涓績</string>
+ <string name="title_personal_center">鎴戠殑</string>
<string name="title_family_create_project">寮犳皬app绔嬮」</string>
<string name="iv_fold_1_description">杩欐槸涓�涓睍寮�鎺т欢</string>
<!-- TODO: Remove or change this placeholder text -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 22f90ca..9a5e65e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,8 +3,8 @@
<!--涓婚〉搴曢儴瀵艰埅鏍忛�変腑鏂囧瓧鏍峰紡 -->
<style name="bottom_navigation_title_active">
- <item name="android:textSize">@dimen/sp_14</item>
- <item name="android:textColor">@color/color_FFF08EBA_text_pink</item>
+ <item name="android:textSize">14sp</item>
+ <item name="android:textColor">?attr/text_color_main</item>
</style>
<!--涓婚〉搴曢儴瀵艰埅鏍忔病鏈夐�変腑鏂囧瓧鏍峰紡锛屽鑸粯璁ょ殑瀛椾綋澶у皬灏辨槸12sp-->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 32a46f7..edb0971 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -14,26 +14,27 @@
<!-- Customize your theme here. -->
</style>
- <style name="Theme.app" parent="Theme.AppCompat.DayNight.NoActionBar">
+ <!-- 姝ｅ父涓婚 -->
+ <style name="AppTheme.Normal" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- 鍏ㄥ眬瀛椾綋 -->
<item name="android:fontFamily">@font/roboto_regular</item>
<!-- 绐楀彛鑳屾櫙棰滆壊 -->
<item name="android:windowBackground">@color/windowBackground</item>
<!-- 搴旂敤鐨勪富瑕佽壊璋冿紝ActionBar Toolbar 榛樿浣跨敤璇ラ鑹� -->
- <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimary">@color/color_normal_main</item>
<!-- 搴旂敤鐨勪富瑕佹殫鑹茶皟锛岀姸鎬佹爮榛樿浣跨敤璇ラ鑹� -->
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<!-- 搴旂敤鐨勫己璋冭壊锛孋heckBox RadioButton Switch 绛変竴鑸帶浠剁殑閫変腑鏁堟灉榛樿閲囩敤璇ラ鑹� -->
<item name="colorAccent">@color/colorAccent</item>
<!-- 榛樿鏂囨湰棰滆壊锛孊utton銆乀extView 鐨勬枃瀛楅鑹�-->
-<!-- <item name="android:textColor">@color/textColor</item>-->
+ <!-- <item name="android:textColor">@color/textColor</item>-->
<!-- 榛樿鎻愮ず棰滆壊锛孊utton銆乀extView 鐨勬彁绀烘枃瀛楅鑹� -->
-<!-- <item name="android:textColorHint">@color/textColorHint</item>-->
+ <!-- <item name="android:textColorHint">@color/textColorHint</item>-->
<!-- ActionMode 瑕嗙洊 Actionbar 涓嶈椤朵笅鏉� -->
<item name="windowActionModeOverlay">true</item>
<item name="android:windowContentOverlay">@null</item>
<!-- ActionMode 鐨勯鑹� -->
- <item name="actionModeBackground">@color/colorPrimary</item>
+ <item name="actionModeBackground">@color/color_normal_main</item>
<!-- 瑙ｅ喅 Android 5.1 鍙婁互涓婄増鏈� Button 鑻辨枃瀛楃涓茶嚜鍔ㄥ彉澶у啓鐨勯棶棰� -->
<item name="android:textAllCaps">false</item>
<!-- 榛樿闅愯棌杈撳叆娉曪紝寮�鍚繖涓�夐」鍚庝細瀵艰嚧杈撳叆瀵硅瘽妗嗗湪鍏抽棴涔嬪悗涓嶈兘鍏抽棴杞敭鐩� -->
@@ -41,11 +42,172 @@
<!-- 鍏抽棴 RecyclerView ScrollView ViewPager 姘存尝绾规晥鏋� -->
<item name="android:overScrollMode">never</item>
+ <!-- 椤甸潰鑳屾櫙棰滆壊 -->
+ <item name="pageBackgroundColor">@color/color_normal_background</item>
+ <!-- 璇︽儏椤佃儗鏅鑹� -->
+ <item name="detailPageBackgroundColor">@color/color_normal_detail_page_background</item>
+ <!-- 鏍囬鏍忚儗鏅鑹� -->
+ <item name="titleBarBackgroundColor">@color/color_normal_title_bar_background</item>
+ <!-- 搴曢儴瀵艰埅鏍忚儗鏅鑹� -->
+ <item name="bottomNavigationViewBackgroundColor">@color/color_normal_bottom_navigation_view_background</item>
+ <!-- 搴曢儴瀵艰埅鏍忛�変腑鏂囧瓧鏍峰紡 -->
+ <item name="text_color_main">@color/color_FFF08EBA_text_pink</item>
+ <!-- 搴曢儴瀵艰埅鏍忛�変腑鍥炬爣鏍峰紡 -->
+ <item name="menuIconHome">@drawable/selector_bottom_navigation_home</item>
+ <item name="menuIconTree">@drawable/selector_bottom_navigation_tree</item>
+ <item name="menuIconUser">@drawable/selector_bottom_navigation_personal_center</item>
+
+ <!-- 鍔熻兘鍥炬爣 -->
+ <item name="icFunctionFamilyRootNet">@drawable/function_family_root_net</item>
+ <item name="icFunctionNotes">@drawable/ic_function_notes</item>
+ <item name="icFunctionAsset">@drawable/ic_function_asset</item>
+ <item name="icFunctionHonor">@drawable/ic_function_honor</item>
+ <item name="icFunctionLittleDoctor">@drawable/ic_function_little_doctor</item>
+ <item name="icFunctionCleaning">@drawable/ic_function_cleaning</item>
+ <item name="icFunctionMailList">@drawable/ic_function_mail_list</item>
+ <item name="icFunctionPamperPet">@drawable/ic_function_pamper_pet</item>
+ <item name="icFunctionIncomeExpense">@drawable/ic_function_income_expense</item>
+ <item name="icFunctionHomeDevices">@drawable/ic_function_home_devices</item>
+ <item name="icFunctionGrowth">@drawable/ic_function_growth</item>
+ <item name="icFunctionMarriage">@drawable/ic_function_marriage</item>
+ <item name="icFunctionProperty">@drawable/ic_function_property</item>
+ <item name="icFunctionWish">@drawable/ic_function_wish</item>
+ <item name="icFunctionTour">@drawable/ic_function_tour</item>
+ <item name="icFunctionHealth">@drawable/ic_function_health</item>
+ <item name="icFunctionCertificate">@drawable/ic_function_certificate</item>
+ <item name="icFunctionPrivacy">@drawable/ic_function_privacy</item>
+
+ <!-- 鏁版嵁鍒楄〃 鍗＄墖鑳屾櫙鑹� -->
+ <item name="cardBackgroundColorFirst">@color/color_card_pink</item>
+ <!-- 鏁版嵁鍒楄〃 闂撮殧鍗＄墖鑳屾櫙鑹� -->
+ <item name="cardBackgroundColorSecond">@color/color_card_blue</item>
+
+ <!-- 渚ф粦鑿滃崟鑳屾櫙鑹� -->
+ <item name="drawerBackgroundColor">@color/color_normal_drawer_bg</item>
+ <!-- 渚ф粦鑿滃崟閫変腑鏂囧瓧鏍峰紡 -->
+ <item name="drawerTextColor">@color/color_FFF08EBA_text_pink</item>
+ <!-- 渚ф粦鑿滃崟閫変腑鍥炬爣鏍峰紡 -->
+ <item name="drawerSelectIcon">@drawable/ic_vector_pink</item>
+
+ <!-- 鏄惁鏄嚜宸辩殑瀹跺涵鏁版嵁 -->
+ <item name="icIsOwnFamilyDataFlower">@drawable/ic_flower</item>
+
+ <!-- 灞曞紑鍥炬爣 -->
+ <item name="icUnfold">@drawable/ic_unfold</item>
+ <!-- 鏀惰捣鍥炬爣 -->
+ <item name="icFold">@drawable/ic_fold</item>
+
+ <!-- 寮圭獥鑳屾櫙鑹� -->
+ <item name="popupWindowBackgroundColor">@color/color_normal_popup_window_bg</item>
+
+ <!-- 鐢靛瓙鏂囦欢娣诲姞鎸夐挳鑳屾櫙鑹� -->
+ <item name="electronicFileAddBackgroundColor">@color/color_normal_electronic_file_add_bg</item>
+
+ <!-- 鐢靛瓙鏂囦欢鏍囪瘑 -->
+ <item name="icPdf">@drawable/ic_pdf</item>
+ <item name="icWord">@drawable/ic_word</item>
+ <item name="icExcel">@drawable/ic_excel</item>
+ <item name="icPpt">@drawable/ic_ppt</item>
+ <item name="icTxt">@drawable/ic_txt</item>
+ <item name="icImage">@drawable/ic_img</item>
+ <item name="icVideo">@drawable/ic_video</item>
+ <item name="icAudio">@drawable/ic_audio</item>
+ <item name="icOther">@drawable/ic_others</item>
+ <item name="icZip">@drawable/ic_zip</item>
+
+ <!-- 澶嶉�夋鏍峰紡 -->
+ <item name="checkboxSelector">@drawable/selector_checkbox</item>
</style>
+ <!-- 鎶ょ溂妯″紡涓婚 -->
+ <style name="AppTheme.Night" parent="AppTheme.Normal">
+
+ <!-- 搴旂敤鐨勪富瑕佽壊璋冿紝ActionBar Toolbar 榛樿浣跨敤璇ラ鑹� -->
+ <item name="colorPrimary">@color/color_night_main</item>
+ <!-- 搴旂敤鐨勫己璋冭壊锛孋heckBox RadioButton Switch 绛変竴鑸帶浠剁殑閫変腑鏁堟灉榛樿閲囩敤璇ラ鑹� -->
+ <item name="colorAccent">@color/color_night_main</item>
+
+ <!-- 椤甸潰鑳屾櫙棰滆壊 -->
+ <item name="pageBackgroundColor">@color/color_night_background</item>
+ <!-- 璇︽儏椤佃儗鏅鑹� -->
+ <item name="detailPageBackgroundColor">@color/color_night_detail_page_background</item>
+ <!-- 鏍囬鏍忚儗鏅鑹� -->
+ <item name="titleBarBackgroundColor">@color/color_night_title_bar_background</item>
+ <!-- 搴曢儴瀵艰埅鏍忚儗鏅鑹� -->
+ <item name="bottomNavigationViewBackgroundColor">@color/color_night_bottom_navigation_view_background</item>
+ <!-- 搴曢儴瀵艰埅鏍忛�変腑鏂囧瓧鏍峰紡 -->
+ <item name="text_color_main">@color/color_FF4E9F3D_text_green</item>
+ <!-- 搴曢儴瀵艰埅鏍忛�変腑鍥炬爣鏍峰紡 -->
+ <item name="menuIconHome">@drawable/selector_bottom_navigation_home_night</item>
+ <item name="menuIconTree">@drawable/selector_bottom_navigation_tree</item>
+ <item name="menuIconUser">@drawable/selector_bottom_navigation_personal_center_night</item>
+
+ <!-- 鍔熻兘鍥炬爣 -->
+ <item name="icFunctionFamilyRootNet">@drawable/ic_function_family_root_net_night</item>
+ <item name="icFunctionNotes">@drawable/ic_function_notes_night</item>
+ <item name="icFunctionAsset">@drawable/ic_function_asset_night</item>
+ <item name="icFunctionHonor">@drawable/ic_function_honor_night</item>
+ <item name="icFunctionLittleDoctor">@drawable/ic_function_little_doctor_night</item>
+ <item name="icFunctionCleaning">@drawable/ic_function_cleaning_night</item>
+ <item name="icFunctionMailList">@drawable/ic_function_mail_list_night</item>
+ <item name="icFunctionPamperPet">@drawable/ic_function_pamper_pet_night</item>
+ <item name="icFunctionIncomeExpense">@drawable/ic_function_income_expense_night</item>
+ <item name="icFunctionHomeDevices">@drawable/ic_function_home_devices_night</item>
+ <item name="icFunctionGrowth">@drawable/ic_function_growth_night</item>
+ <item name="icFunctionMarriage">@drawable/ic_function_marriage_night</item>
+ <item name="icFunctionProperty">@drawable/ic_function_property_night</item>
+ <item name="icFunctionWish">@drawable/ic_function_wish_night</item>
+ <item name="icFunctionTour">@drawable/ic_function_tour_night</item>
+ <item name="icFunctionHealth">@drawable/ic_function_health_night</item>
+ <item name="icFunctionCertificate">@drawable/ic_function_certificate_night</item>
+ <item name="icFunctionPrivacy">@drawable/ic_function_privacy_night</item>
+
+ <!-- 鏁版嵁鍒楄〃 鍗＄墖鑳屾櫙鑹� -->
+ <item name="cardBackgroundColorFirst" >@color/color_card_yellow</item>
+ <!-- 鏁版嵁鍒楄〃 闂撮殧鍗＄墖鑳屾櫙鑹� -->
+ <item name="cardBackgroundColorSecond">@color/color_card_orange</item>
+
+ <!-- 渚ф粦鑿滃崟鑳屾櫙棰滆壊 -->
+ <item name="drawerBackgroundColor">@color/color_night_drawer_bg</item>
+ <!-- 渚ф粦鑿滃崟閫変腑鏂囧瓧鏍峰紡 -->
+ <item name="drawerTextColor">@color/color_night_drawer_text_color</item>
+ <!-- 渚ф粦鑿滃崟鏈�変腑鏂囧瓧鏍峰紡 -->
+ <item name="drawerSelectIcon">@drawable/ic_vector_green</item>
+
+ <!-- 鏄惁鏄嚜宸辩殑瀹跺涵鏁版嵁 -->
+ <item name="icIsOwnFamilyDataFlower">@drawable/ic_flower_night</item>
+
+ <!-- 灞曞紑鍥炬爣 -->
+ <item name="icUnfold">@drawable/ic_unfold_night</item>
+ <!-- 鏀惰捣鍥炬爣 -->
+ <item name="icFold">@drawable/ic_fold_night</item>
+
+ <!-- 寮圭獥鑳屾櫙鑹� -->
+ <item name="popupWindowBackgroundColor">@color/color_night_popup_window_bg</item>
+
+ <!-- 鐢靛瓙鏂囦欢娣诲姞鎸夐挳鑳屾櫙鑹� -->
+ <item name="electronicFileAddBackgroundColor">@color/color_night_electronic_file_add_bg</item>
+
+ <!-- 鐢靛瓙鏂囦欢鏍囪瘑 -->
+ <item name="icPdf">@drawable/ic_pdf_night</item>
+ <item name="icWord">@drawable/ic_word_night</item>
+ <item name="icExcel">@drawable/ic_excel_night</item>
+ <item name="icPpt">@drawable/ic_ppt_night</item>
+ <item name="icTxt">@drawable/ic_txt_night</item>
+ <item name="icImage">@drawable/ic_img_night</item>
+ <item name="icVideo">@drawable/ic_video_night</item>
+ <item name="icAudio">@drawable/ic_audio_night</item>
+ <item name="icOther">@drawable/ic_others_night</item>
+ <item name="icZip">@drawable/ic_zip_night</item>
+
+ <!-- 澶嶉�夋鏍峰紡 -->
+ <item name="checkboxSelector">@drawable/selector_checkbox_night</item>
+ </style>
+
+
<!-- 鍏ㄥ睆涓婚鏍峰紡 -->
- <style name="FullScreenTheme" parent="Theme.app">
+ <style name="FullScreenTheme" parent="AppTheme.Normal">
<item name="android:windowFullscreen">true</item>
</style>
</resources>
\ No newline at end of file
diff --git a/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java b/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
index 2a4d160..df683f6 100644
--- a/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
+++ b/app_base/src/main/java/com/android/app_base/base/view/BaseFragment.java
@@ -1,6 +1,7 @@
package com.android.app_base.base.view;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -185,7 +186,7 @@
viewModel.getMessageLivaData().observe(this, new Observer<String>() {
@Override
public void onChanged(String message) {
- if (message != null){
+ if (!TextUtils.isEmpty(message)){
ToastUtils.showShort(message);
}
}
diff --git a/app_base/src/main/java/com/android/app_base/http/interceptor/AuthInterceptor.java b/app_base/src/main/java/com/android/app_base/http/interceptor/AuthInterceptor.java
index 1593003..92433ec 100644
--- a/app_base/src/main/java/com/android/app_base/http/interceptor/AuthInterceptor.java
+++ b/app_base/src/main/java/com/android/app_base/http/interceptor/AuthInterceptor.java
@@ -61,7 +61,7 @@
JSONObject responseObject = new JSONObject(string);
int code = responseObject.getInt("code");
if (code == BaseConfig.TOKEN_INVALID ) {
- UserManager.getInstance().clearToken();
+ UserManager.getInstance().loginOut();
AppManager.getAppManager().finishAllActivity();
AppManager.getAppManager().startActivityForName(BaseConfig.LOGIN_ACTIVITY);
throw new IOException("鐧诲綍鐘舵�佸け鏁堬紝璇烽噸鏂扮櫥褰�");
diff --git a/app_base/src/main/java/com/android/app_base/manager/AppManager.java b/app_base/src/main/java/com/android/app_base/manager/AppManager.java
index d99767c..251c58c 100644
--- a/app_base/src/main/java/com/android/app_base/manager/AppManager.java
+++ b/app_base/src/main/java/com/android/app_base/manager/AppManager.java
@@ -1,13 +1,20 @@
package com.android.app_base.manager;
import android.app.Activity;
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.ComponentName;
+import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.text.TextUtils;
+import android.util.Log;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.AppUtils;
import java.util.Stack;
@@ -218,4 +225,18 @@
e.printStackTrace();
}
}
+
+ /**
+ * 閲嶅惎搴旂敤
+ */
+ public void restartApp() {
+ AppUtils.relaunchApp();
+ }
+ public void restartApp(Context context) {
+ Intent intent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ startActivity(intent);
+ AppExit();
+ }
}
\ No newline at end of file
diff --git a/app_base/src/main/java/com/android/app_base/manager/UserManager.java b/app_base/src/main/java/com/android/app_base/manager/UserManager.java
index dcaa875..ad165d3 100644
--- a/app_base/src/main/java/com/android/app_base/manager/UserManager.java
+++ b/app_base/src/main/java/com/android/app_base/manager/UserManager.java
@@ -124,9 +124,29 @@
SPUtils.getInstance("userInfo").remove("userAvatar");
}
+ /**
+ * 閫�鍑虹櫥褰曪紝娓呴櫎鐘舵��
+ */
public void loginOut(){
clearToken();
clearUserInfo();
}
+ /**
+ * 淇濆瓨鎶ょ溂妯″紡 鐘舵��
+ */
+ // 淇濆瓨鎶ょ溂妯″紡鐨勭姸鎬�
+ public void saveNightModeState(boolean isNightMode) {
+ SPUtils.getInstance("nightMode").put("nightMode", isNightMode);
+ }
+ // 鑾峰彇鎶ょ溂妯″紡鐨勭姸鎬�
+ public boolean getNightModeState() {
+ return SPUtils.getInstance("nightMode").getBoolean("nightMode", false);
+ }
+ // 娓呴櫎鎶ょ溂妯″紡鐨勭姸鎬�
+ public void clearNightModeState() {
+ SPUtils.getInstance("nightMode").clear();
+ }
+
+
}
diff --git a/app_base/src/main/java/com/android/app_base/utils/Utils.java b/app_base/src/main/java/com/android/app_base/utils/Utils.java
index b8d9bc6..df7e5b7 100644
--- a/app_base/src/main/java/com/android/app_base/utils/Utils.java
+++ b/app_base/src/main/java/com/android/app_base/utils/Utils.java
@@ -1,6 +1,7 @@
package com.android.app_base.utils;
import android.animation.ValueAnimator;
+import android.app.ActionBar;
import android.app.ActivityManager;
import android.app.Application;
import android.content.Context;
@@ -25,6 +26,13 @@
import com.blankj.utilcode.util.LogUtils;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.security.DigestInputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -281,4 +289,39 @@
return new BitmapDrawable(view.getResources(), bitmap);
}
+
+ /**
+ * 璁＄畻鏂囦欢鐨凪D5鍝堝笇鍊�
+ *
+ * @param file 鏂囦欢
+ * @return 鏂囦欢鐨凪D5鍝堝笇鍊硷紝濡傛灉璁＄畻澶辫触鍒欒繑鍥瀗ull
+ */
+ public static String calculateMD5(File file) {
+ try {
+ // 鑾峰彇MD5娑堟伅鎽樿绠楁硶鐨勫疄渚�
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ // 鍒涘缓鏂囦欢URL
+ // 鎵撳紑鏂囦欢杈撳叆娴侊紝骞朵娇鐢―igestInputStream鏇存柊娑堟伅鎽樿
+ try (FileInputStream is = new FileInputStream(file);
+ DigestInputStream dis = new DigestInputStream(is, md)) {
+ // 璇诲彇杈撳叆娴佸苟鏇存柊娑堟伅鎽樿
+ byte[] buffer = new byte[1024*256];
+ while(true){
+ if (!(dis.read(buffer) > 0)) break;
+ }
+ // 鑾峰彇MD5鍝堝笇鍊肩殑瀛楄妭鏁扮粍
+ md = dis.getMessageDigest();
+ byte[] mdBytes = md.digest();
+ // 灏嗗瓧鑺傛暟缁勮浆鎹负鍗佸叚杩涘埗瀛楃涓�
+ StringBuilder hexString = new StringBuilder();
+ for (byte mdByte : mdBytes) {
+ hexString.append(Integer.toHexString(0xFF & mdByte));
+ }
+ return hexString.toString();
+ }
+ } catch (NoSuchAlgorithmException | IOException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
}
diff --git a/app_base/src/main/java/com/android/app_base/widget/SwitchButton.java b/app_base/src/main/java/com/android/app_base/widget/SwitchButton.java
new file mode 100644
index 0000000..bad7a19
--- /dev/null
+++ b/app_base/src/main/java/com/android/app_base/widget/SwitchButton.java
@@ -0,0 +1,536 @@
+package com.android.app_base.widget;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.RadialGradient;
+import android.graphics.RectF;
+import android.graphics.Shader;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.animation.AccelerateInterpolator;
+
+import androidx.annotation.Nullable;
+
+import com.android.app_base.R;
+import com.android.app_base.utils.ScreenSizeUtils;
+
+/**
+ * 楂樹豢 ios 寮�鍏虫寜閽�
+ */
+public final class SwitchButton extends View {
+
+ private static final int STATE_SWITCH_OFF = 1;
+ private static final int STATE_SWITCH_OFF2 = 2;
+ private static final int STATE_SWITCH_ON = 3;
+ private static final int STATE_SWITCH_ON2 = 4;
+
+ private final AccelerateInterpolator mInterpolator = new AccelerateInterpolator(2);
+ private final Paint mPaint = new Paint();
+ private final Path mBackgroundPath = new Path();
+ private final Path mBarPath = new Path();
+ private final RectF mBound = new RectF();
+
+ private float mAnim1, mAnim2;
+ private RadialGradient mShadowGradient;
+
+ /** 鎸夐挳瀹介珮褰㈢姸姣旂巼(0,1] 涓嶆帹鑽愬ぇ骞呭害璋冩暣 */
+ protected final float mAspectRatio = 0.68f;
+ /** (0,1] */
+ protected final float mAnimationSpeed = 0.1f;
+
+ /** 涓婁竴涓�変腑鐘舵�� */
+ private int mLastCheckedState;
+ /** 褰撳墠鐨勯�変腑鐘舵�� */
+ private int mCheckedState;
+
+ private boolean mCanVisibleDrawing = false;
+
+ /** 鏄惁鏄剧ず鎸夐挳闃村奖 */
+ protected boolean mShadow;
+ /** 鏄惁閫変腑 */
+ protected boolean mChecked;
+
+ /** 寮�鍚姸鎬佽儗鏅壊 */
+ protected int mAccentColor = 0xFF4BD763;
+ /** 寮�鍚姸鎬佹寜閽弿杈硅壊 */
+ protected int mPrimaryDarkColor = 0xFF3AC652;
+ /** 鍏抽棴鐘舵�佹弿杈硅壊 */
+ protected int mOffColor = 0xFFE3E3E3;
+ /** 鍏抽棴鐘舵�佹寜閽弿杈硅壊 */
+ protected int mOffDarkColor = 0xFFBFBFBF;
+ /** 鎸夐挳闃村奖鑹� */
+ protected int mShadowColor = 0xFF333333;
+ /** 鐩戝惉鍣� */
+ @Nullable
+ private OnCheckedChangeListener mListener;
+
+ private float mRight;
+ private float mCenterX, mCenterY;
+ private float mScale;
+
+ private float mOffset;
+ private float mRadius, mStrokeWidth;
+ private float mWidth;
+ private float mLeft;
+ private float bRight;
+ private float mOnLeftX, mOn2LeftX, mOff2LeftX, mOffLeftX;
+
+ private float mShadowReservedHeight;
+
+ public SwitchButton(Context context) {
+ this(context, null);
+ }
+
+ public SwitchButton(Context context, @Nullable AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public SwitchButton(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public SwitchButton(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
+ setLayerType(LAYER_TYPE_SOFTWARE, null);
+
+ TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.SwitchButton);
+ mChecked = array.getBoolean(R.styleable.SwitchButton_android_checked, mChecked);
+ setEnabled(array.getBoolean(R.styleable.SwitchButton_android_enabled, isEnabled()));
+ mLastCheckedState = mCheckedState = mChecked ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
+
+ array.recycle();
+ }
+
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ switch (MeasureSpec.getMode(widthMeasureSpec)) {
+ case MeasureSpec.AT_MOST:
+ case MeasureSpec.UNSPECIFIED:
+ widthMeasureSpec = MeasureSpec.makeMeasureSpec((int) (ScreenSizeUtils.dip2px(56) + getPaddingLeft() + getPaddingRight()), MeasureSpec.EXACTLY);
+ break;
+ case MeasureSpec.EXACTLY:
+ default:
+ break;
+ }
+ switch (MeasureSpec.getMode(heightMeasureSpec)) {
+ case MeasureSpec.AT_MOST:
+ case MeasureSpec.UNSPECIFIED:
+ heightMeasureSpec = MeasureSpec.makeMeasureSpec((int) (MeasureSpec.getSize(widthMeasureSpec) * mAspectRatio)
+ + getPaddingTop() + getPaddingBottom(), MeasureSpec.EXACTLY);
+ break;
+ case MeasureSpec.EXACTLY:
+ default:
+ break;
+ }
+ setMeasuredDimension(widthMeasureSpec, heightMeasureSpec);
+ }
+
+ @Override
+ protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+ mCanVisibleDrawing = width > getPaddingLeft() + getPaddingRight() && height > getPaddingTop() + getPaddingBottom();
+
+ if (mCanVisibleDrawing) {
+ int actuallyDrawingAreaWidth = width - getPaddingLeft() - getPaddingRight();
+ int actuallyDrawingAreaHeight = height - getPaddingTop() - getPaddingBottom();
+
+ int actuallyDrawingAreaLeft;
+ int actuallyDrawingAreaRight;
+ int actuallyDrawingAreaTop;
+ int actuallyDrawingAreaBottom;
+ if (actuallyDrawingAreaWidth * mAspectRatio < actuallyDrawingAreaHeight) {
+ actuallyDrawingAreaLeft = getPaddingLeft();
+ actuallyDrawingAreaRight = width - getPaddingRight();
+ int heightExtraSize = (int) (actuallyDrawingAreaHeight - actuallyDrawingAreaWidth * mAspectRatio);
+ actuallyDrawingAreaTop = getPaddingTop() + heightExtraSize / 2;
+ actuallyDrawingAreaBottom = getHeight() - getPaddingBottom() - heightExtraSize / 2;
+ } else {
+ int widthExtraSize = (int) (actuallyDrawingAreaWidth - actuallyDrawingAreaHeight / mAspectRatio);
+ actuallyDrawingAreaLeft = getPaddingLeft() + widthExtraSize / 2;
+ actuallyDrawingAreaRight = getWidth() - getPaddingRight() - widthExtraSize / 2;
+ actuallyDrawingAreaTop = getPaddingTop();
+ actuallyDrawingAreaBottom = getHeight() - getPaddingBottom();
+ }
+
+ mShadowReservedHeight = (int) ((actuallyDrawingAreaBottom - actuallyDrawingAreaTop) * 0.07f);
+ float left = actuallyDrawingAreaLeft;
+ float top = actuallyDrawingAreaTop + mShadowReservedHeight;
+ mRight = actuallyDrawingAreaRight;
+ float bottom = actuallyDrawingAreaBottom - mShadowReservedHeight;
+
+ float sHeight = bottom - top;
+ mCenterX = (mRight + left) / 2;
+ mCenterY = (bottom + top) / 2;
+
+ mLeft = left;
+ mWidth = bottom - top;
+ bRight = left + mWidth;
+ // OfB
+ final float halfHeightOfS = mWidth / 2;
+ mRadius = halfHeightOfS * 0.95f;
+ // offset of switching
+ mOffset = mRadius * 0.2f;
+ mStrokeWidth = (halfHeightOfS - mRadius) * 2;
+ mOnLeftX = mRight - mWidth;
+ mOn2LeftX = mOnLeftX - mOffset;
+ mOffLeftX = left;
+ mOff2LeftX = mOffLeftX + mOffset;
+ mScale = 1 - mStrokeWidth / sHeight;
+
+ mBackgroundPath.reset();
+ RectF bound = new RectF();
+ bound.top = top;
+ bound.bottom = bottom;
+ bound.left = left;
+ bound.right = left + sHeight;
+ mBackgroundPath.arcTo(bound, 90, 180);
+ bound.left = mRight - sHeight;
+ bound.right = mRight;
+ mBackgroundPath.arcTo(bound, 270, 180);
+ mBackgroundPath.close();
+
+ mBound.left = mLeft;
+ mBound.right = bRight;
+ // bTop = sTop
+ mBound.top = top + mStrokeWidth / 2;
+ // bBottom = sBottom
+ mBound.bottom = bottom - mStrokeWidth / 2;
+ float bCenterX = (bRight + mLeft) / 2;
+ float bCenterY = (bottom + top) / 2;
+
+ int red = mShadowColor >> 16 & 0xFF;
+ int green = mShadowColor >> 8 & 0xFF;
+ int blue = mShadowColor & 0xFF;
+ mShadowGradient = new RadialGradient(bCenterX, bCenterY, mRadius, Color.argb(200, red, green, blue),
+ Color.argb(25, red, green, blue), Shader.TileMode.CLAMP);
+ }
+ }
+
+ private void calcBPath(float percent) {
+ mBarPath.reset();
+ mBound.left = mLeft + mStrokeWidth / 2;
+ mBound.right = bRight - mStrokeWidth / 2;
+ mBarPath.arcTo(mBound, 90, 180);
+ mBound.left = mLeft + percent * mOffset + mStrokeWidth / 2;
+ mBound.right = bRight + percent * mOffset - mStrokeWidth / 2;
+ mBarPath.arcTo(mBound, 270, 180);
+ mBarPath.close();
+ }
+
+ private float calcBTranslate(float percent) {
+ float result = 0;
+ switch (mCheckedState - mLastCheckedState) {
+ case 1:
+ if (mCheckedState == STATE_SWITCH_OFF2) {
+ // off -> off2
+ result = mOffLeftX;
+ } else if (mCheckedState == STATE_SWITCH_ON) {
+ // on2 -> on
+ result = mOnLeftX - (mOnLeftX - mOn2LeftX) * percent;
+ }
+ break;
+ case 2:
+ if (mCheckedState == STATE_SWITCH_ON) {
+ // off2 -> on
+ result = mOnLeftX - (mOnLeftX - mOffLeftX) * percent;
+ } else if (mCheckedState == STATE_SWITCH_ON2) {
+ // off -> on2
+ result = mOn2LeftX - (mOn2LeftX - mOffLeftX) * percent;
+ }
+ break;
+ case 3:
+ // off -> on
+ result = mOnLeftX - (mOnLeftX - mOffLeftX) * percent;
+ break;
+ case -1:
+ if (mCheckedState == STATE_SWITCH_ON2) {
+ // on -> on2
+ result = mOn2LeftX + (mOnLeftX - mOn2LeftX) * percent;
+ } else if (mCheckedState == STATE_SWITCH_OFF) {
+ // off2 -> off
+ result = mOffLeftX;
+ }
+ break;
+ case -2:
+ if (mCheckedState == STATE_SWITCH_OFF) {
+ // on2 -> off
+ result = mOffLeftX + (mOn2LeftX - mOffLeftX) * percent;
+ } else if (mCheckedState == STATE_SWITCH_OFF2) {
+ // on -> off2
+ result = mOff2LeftX + (mOnLeftX - mOff2LeftX) * percent;
+ }
+ break;
+ case -3:
+ // on -> off
+ result = mOffLeftX + (mOnLeftX - mOffLeftX) * percent;
+ break;
+ default: // init
+ case 0:
+ if (mCheckedState == STATE_SWITCH_OFF) {
+ // off -> off
+ result = mOffLeftX;
+ } else if (mCheckedState == STATE_SWITCH_ON) {
+ // on -> on
+ result = mOnLeftX;
+ }
+ break;
+ }
+ return result - mOffLeftX;
+ }
+
+ @Override
+ protected void onDraw(Canvas canvas) {
+ if (!mCanVisibleDrawing) {
+ return;
+ }
+
+ mPaint.setAntiAlias(true);
+
+ final boolean isOn = (mCheckedState == STATE_SWITCH_ON || mCheckedState == STATE_SWITCH_ON2);
+ // Draw background
+ mPaint.setStyle(Paint.Style.FILL);
+ mPaint.setColor(isOn ? mAccentColor : mOffColor);
+ canvas.drawPath(mBackgroundPath, mPaint);
+
+ mAnim1 = mAnim1 - mAnimationSpeed > 0 ? mAnim1 - mAnimationSpeed : 0;
+ mAnim2 = mAnim2 - mAnimationSpeed > 0 ? mAnim2 - mAnimationSpeed : 0;
+
+ final float dsAnim = mInterpolator.getInterpolation(mAnim1);
+ final float dbAnim = mInterpolator.getInterpolation(mAnim2);
+ // Draw background animation
+ final float scale = mScale * (isOn ? dsAnim : 1 - dsAnim);
+ final float scaleOffset = (mRight - mCenterX - mRadius) * (isOn ? 1 - dsAnim : dsAnim);
+ canvas.save();
+ canvas.scale(scale, scale, mCenterX + scaleOffset, mCenterY);
+ if (isEnabled()) {
+ mPaint.setColor(0xFFFFFFFF);
+ } else {
+ mPaint.setColor(0xFFBBBBBB);
+ }
+ canvas.drawPath(mBackgroundPath, mPaint);
+ canvas.restore();
+ // To prepare center bar path
+ canvas.save();
+ canvas.translate(calcBTranslate(dbAnim), mShadowReservedHeight);
+ final boolean isState2 = (mCheckedState == STATE_SWITCH_ON2 || mCheckedState == STATE_SWITCH_OFF2);
+ calcBPath(isState2 ? 1 - dbAnim : dbAnim);
+ // Use center bar path to draw shadow
+ if (mShadow) {
+ mPaint.setStyle(Paint.Style.FILL);
+ mPaint.setShader(mShadowGradient);
+ canvas.drawPath(mBarPath, mPaint);
+ mPaint.setShader(null);
+ }
+ canvas.translate(0, -mShadowReservedHeight);
+ // draw bar
+ canvas.scale(0.98f, 0.98f, mWidth / 2, mWidth / 2);
+ mPaint.setStyle(Paint.Style.FILL);
+ mPaint.setColor(0xFFFFFFFF);
+ canvas.drawPath(mBarPath, mPaint);
+ mPaint.setStyle(Paint.Style.STROKE);
+ mPaint.setStrokeWidth(mStrokeWidth * 0.5f);
+ mPaint.setColor(isOn ? mPrimaryDarkColor : mOffDarkColor);
+ canvas.drawPath(mBarPath, mPaint);
+ canvas.restore();
+
+ mPaint.reset();
+ if (mAnim1 > 0 || mAnim2 > 0) {
+ invalidate();
+ }
+ }
+
+ @SuppressLint("ClickableViewAccessibility")
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ super.onTouchEvent(event);
+
+ if (isEnabled()
+ && (mCheckedState == STATE_SWITCH_ON || mCheckedState == STATE_SWITCH_OFF)
+ && (mAnim1 * mAnim2 == 0)) {
+
+ switch (event.getAction()) {
+ case MotionEvent.ACTION_UP:
+ mLastCheckedState = mCheckedState;
+ mAnim2 = 1;
+
+ switch (mCheckedState) {
+ case STATE_SWITCH_OFF:
+ setChecked(true, false);
+ if (mListener != null) {
+ mListener.onCheckedChanged(this, true);
+ }
+ break;
+ case STATE_SWITCH_ON:
+ setChecked(false, false);
+ if (mListener != null) {
+ mListener.onCheckedChanged(this, false);
+ }
+ break;
+ default:
+ break;
+ }
+ break;
+ case MotionEvent.ACTION_DOWN:
+ default:
+ break;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public Parcelable onSaveInstanceState() {
+ Parcelable superState = super.onSaveInstanceState();
+ SavedState state = new SavedState(superState);
+ state.checked = mChecked;
+ return state;
+ }
+
+ @Override
+ public void onRestoreInstanceState(Parcelable state) {
+ SavedState savedState = (SavedState) state;
+ super.onRestoreInstanceState(savedState.getSuperState());
+ mChecked = savedState.checked;
+ mCheckedState = mChecked ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
+ invalidate();
+ }
+
+ public void setColor(int newColorPrimary, int newColorPrimaryDark) {
+ setColor(newColorPrimary, newColorPrimaryDark, mOffColor, mOffDarkColor);
+ }
+
+ public void setColor(int newColorPrimary, int newColorPrimaryDark, int newColorOff, int newColorOffDark) {
+ setColor(newColorPrimary, newColorPrimaryDark, newColorOff, newColorOffDark, mShadowColor);
+ }
+
+ public void setColor(int newColorPrimary, int newColorPrimaryDark, int newColorOff, int newColorOffDark, int newColorShadow) {
+ mAccentColor = newColorPrimary;
+ mPrimaryDarkColor = newColorPrimaryDark;
+ mOffColor = newColorOff;
+ mOffDarkColor = newColorOffDark;
+ mShadowColor = newColorShadow;
+ invalidate();
+ }
+
+ /**
+ * 璁剧疆鎸夐挳闃村奖寮�鍏�
+ */
+ public void setShadow(boolean shadow) {
+ mShadow = shadow;
+ invalidate();
+ }
+
+ /**
+ * 褰撳墠鐘舵�佹槸鍚﹂�変腑
+ */
+ public boolean isChecked() {
+ return mChecked;
+ }
+
+ /**
+ * 璁剧疆閫夋嫨鐘舵�侊紙榛樿浼氬洖璋冪洃鍚櫒锛�
+ */
+ public void setChecked(boolean checked) {
+ // 鍥炶皟鐩戝惉鍣�
+ setChecked(checked, true);
+ }
+
+ /**
+ * 璁剧疆閫夋嫨鐘舵��
+ */
+ public void setChecked(boolean checked, boolean callback) {
+ int newState = checked ? STATE_SWITCH_ON : STATE_SWITCH_OFF;
+ if (newState == mCheckedState) {
+ return;
+ }
+ if ((newState == STATE_SWITCH_ON && (mCheckedState == STATE_SWITCH_OFF || mCheckedState == STATE_SWITCH_OFF2))
+ || (newState == STATE_SWITCH_OFF && (mCheckedState == STATE_SWITCH_ON || mCheckedState == STATE_SWITCH_ON2))) {
+ mAnim1 = 1;
+ }
+ mAnim2 = 1;
+
+ if (!mChecked && newState == STATE_SWITCH_ON) {
+ mChecked = true;
+ } else if (mChecked && newState == STATE_SWITCH_OFF) {
+ mChecked = false;
+ }
+ mLastCheckedState = mCheckedState;
+ mCheckedState = newState;
+ postInvalidate();
+
+ if (callback && mListener != null) {
+ mListener.onCheckedChanged(this, checked);
+ }
+ }
+
+ /**
+ * 璁剧疆閫変腑鐘舵�佹敼鍙樼洃鍚�
+ */
+ public void setOnCheckedChangeListener(@Nullable OnCheckedChangeListener listener) {
+ mListener = listener;
+ }
+
+ /**
+ * 閫変腑鐩戝惉鍣�
+ */
+ public interface OnCheckedChangeListener {
+ /**
+ * 鍥炶皟鐩戝惉
+ *
+ * @param button 鍒囨崲鎸夐挳
+ * @param checked 鏄惁閫変腑
+ */
+ void onCheckedChanged(SwitchButton button, boolean checked);
+ }
+
+ /**
+ * 淇濆瓨寮�鍏崇姸鎬�
+ */
+ private static final class SavedState extends BaseSavedState {
+
+ private boolean checked;
+
+ SavedState(Parcelable superState) {
+ super(superState);
+ }
+
+ private SavedState(Parcel in) {
+ super(in);
+ checked = 1 == in.readInt();
+ }
+
+ @Override
+ public void writeToParcel(Parcel out, int flags) {
+ super.writeToParcel(out, flags);
+ out.writeInt(checked ? 1 : 0);
+ }
+
+ /**
+ * fixed by Night99 https://github.com/g19980115
+ */
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+ @Override
+ public SavedState createFromParcel(Parcel in) {
+ return new SavedState(in);
+ }
+
+ @Override
+ public SavedState[] newArray(int size) {
+ return new SavedState[size];
+ }
+ };
+ }
+}
diff --git a/app_base/src/main/res/values/arrts.xml b/app_base/src/main/res/values/arrts.xml
index 081d7c3..65554e7 100644
--- a/app_base/src/main/res/values/arrts.xml
+++ b/app_base/src/main/res/values/arrts.xml
@@ -22,4 +22,12 @@
<!-- 鍔ㄧ敾鏃堕棿 -->
<attr name="pb_animDuration" format="integer" />
</declare-styleable>
+
+ <!-- 浠� ios 寮�鍏虫寜閽� -->
+ <declare-styleable name="SwitchButton">
+ <!-- 鏄惁閫変腑 -->
+ <attr name="android:checked" />
+ <!-- 鏄惁绂佺敤 -->
+ <attr name="android:enabled" />
+ </declare-styleable>
</resources>
\ No newline at end of file
--
Gitblit v1.9.1