From b17b9aa59bae6d03055f14d937821655dfaffa1f Mon Sep 17 00:00:00 2001
From: Linjiajia <319408893@qq.com>
Date: 星期一, 29 一月 2024 23:27:08 +0800
Subject: [PATCH] 1、调整成长经历页面\n2、删除婚姻个人信息
---
app/src/main/java/com/application/zhangshi_app_android/ui/DLBaseActivity.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
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..0af1d3e 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;
@@ -38,11 +39,12 @@
import com.application.zhangshi_app_android.ui.function.IncomeAndExpensesActivity;
import com.application.zhangshi_app_android.ui.function.LittleDoctorActivity;
import com.application.zhangshi_app_android.ui.function.MarriageActivity;
+import com.application.zhangshi_app_android.ui.function.PersonalNotepadActivity;
import com.application.zhangshi_app_android.ui.function.PetActivity;
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 +104,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));
@@ -117,7 +128,7 @@
classMap.put(ContactsActivity.class,(LinearLayout) findViewById(R.id.dl_contacts));
classMap.put(PetActivity.class,(LinearLayout) findViewById(R.id.dl_pet));
classMap.put(IncomeAndExpensesActivity.class,(LinearLayout) findViewById(R.id.dl_income_and_expenses));
- classMap.put(GrowthExperienceActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
+ classMap.put(PersonalNotepadActivity.class,(LinearLayout) findViewById(R.id.dl_growing_up));
classMap.put(MarriageActivity.class,(LinearLayout) findViewById(R.id.dl_marriage));
classMap.put(PropertyActivity.class,(LinearLayout) findViewById(R.id.dl_property));
classMap.put(HundredWishActivity.class,(LinearLayout) findViewById(R.id.dl_hundred_wish));
@@ -132,8 +143,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 +190,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);
}
--
Gitblit v1.9.1