+ 3.9.5 适配微信深色模式

Author: eritpchy

app/build.gradle

@@ -11,7 +11,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 26
         versionCode 20
-        versionName "3.9.3"
+        versionName "3.9.5"
         buildConfigField "String", "APP_PRODUCT_NAME", "\"WeChatFp\""
     }
 

app/src/main/java/com/yyxx/wechatfp/adapter/PreferenceAdapter.java

@@ -1,6 +1,10 @@
 package com.yyxx.wechatfp.adapter;
 
 import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.PorterDuff;
+import android.os.Build;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
@@ -100,6 +104,10 @@ public ViewHolder(Context context) {
             verticalLayout.addView(subTitleText);
 
             selectBox = new CheckBox(context);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                selectBox.setBackgroundTintList(ColorStateList.valueOf(Color.LTGRAY));
+                selectBox.setBackgroundTintMode(PorterDuff.Mode.SRC_OVER);
+            }
             selectBox.setClickable(false);
             selectBox.setFocusable(false);
             selectBox.setFocusableInTouchMode(false);

app/src/main/java/com/yyxx/wechatfp/util/StyleUtil.java

@@ -1,5 +1,7 @@
 package com.yyxx.wechatfp.util;
 
+import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Color;
 import android.util.TypedValue;
 import android.widget.TextView;
@@ -23,4 +25,8 @@ public static void apply(TextView textView) {
         textView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, TEXT_SIZE_DEFAULT);
         textView.setTextColor(TEXT_COLOR_DEFAULT);
     }
+
+    public static boolean isDarkMode(Context context) {
+        return Configuration.UI_MODE_NIGHT_YES == (context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK);
+    }
 }

app/src/main/java/com/yyxx/wechatfp/view/PasswordInputView.java

@@ -49,6 +49,7 @@ private void initView(Context context) {
         rootLLayout.setOrientation(LinearLayout.VERTICAL);
 
         mInputView = new EditText(context);
+        mInputView.setTextColor(Color.BLACK);
         mInputView.setPadding(0, 0, 0, 0);
         mInputView.setBackgroundColor(Color.TRANSPARENT);
         mInputView.setFocusable(true);

app/src/main/java/com/yyxx/wechatfp/xposed/plugin/XposedWeChatPlugin.java

@@ -299,6 +299,8 @@ private void doSettingsMenuInject(final Activity activity) {
             return;
         }
 
+        boolean isDarkMode = StyleUtil.isDarkMode(activity);
+
         LinearLayout settingsItemRootLLayout = new LinearLayout(activity);
         settingsItemRootLLayout.setOrientation(LinearLayout.VERTICAL);
         settingsItemRootLLayout.setLayoutParams(new AbsListView.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
@@ -313,15 +315,15 @@ private void doSettingsMenuInject(final Activity activity) {
         LinearLayout itemHlinearLayout = new LinearLayout(activity);
         itemHlinearLayout.setOrientation(LinearLayout.HORIZONTAL);
         itemHlinearLayout.setWeightSum(1);
-        itemHlinearLayout.setBackground(ViewUtil.genBackgroundDefaultDrawable(Color.WHITE));
+        itemHlinearLayout.setBackground(ViewUtil.genBackgroundDefaultDrawable(isDarkMode ? 0xFF232323 : Color.WHITE, isDarkMode ? 0xFF252525 : 0xFFE5E5E5));
         itemHlinearLayout.setGravity(Gravity.CENTER_VERTICAL);
         itemHlinearLayout.setClickable(true);
         itemHlinearLayout.setOnClickListener(view -> new SettingsView(activity).showInDialog());
 
         int defHPadding = DpUtil.dip2px(activity, 15);
 
         TextView itemNameText = new TextView(activity);
-        itemNameText.setTextColor(0xFF353535);
+        itemNameText.setTextColor(isDarkMode ? 0xFFD3D3D3 : 0xFF353535);
         itemNameText.setText(Lang.getString(R.id.app_settings_name));
         itemNameText.setGravity(Gravity.CENTER_VERTICAL);
         itemNameText.setPadding(DpUtil.dip2px(activity, 14), 0, 0, 0);
@@ -332,11 +334,11 @@ private void doSettingsMenuInject(final Activity activity) {
         itemSummerText.setText(BuildConfig.VERSION_NAME);
         itemSummerText.setGravity(Gravity.CENTER_VERTICAL);
         itemSummerText.setPadding(0, 0, defHPadding, 0);
-        itemSummerText.setTextColor(0xFF999999);
+        itemSummerText.setTextColor(isDarkMode ? 0xFF656565 : 0xFF999999);
 
         //try use WeChat style
         try {
-            View generalView = ViewUtil.findViewByText(itemView, "通用", "一般", "General");
+            View generalView = ViewUtil.findViewByText(itemView, "通用", "一般", "General", "服务管理", "服務管理", "Manage Services");
             L.d("generalView", generalView);
             if (generalView instanceof TextView) {
                 TextView generalTextView = (TextView) generalView;
@@ -370,7 +372,7 @@ private void doSettingsMenuInject(final Activity activity) {
 
         if (mWeChatVersionCode >= 1380) { //7.0.0
             View lineView = new View(activity);
-            lineView.setBackgroundColor(0xFFD5D5D5);
+            lineView.setBackgroundColor(isDarkMode ? 0xFF2E2E2E : 0xFFD5D5D5);
             settingsItemLinearLayout.addView(lineView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 1));
             settingsItemLinearLayout.addView(itemHlinearLayout, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, DpUtil.dip2px(activity, 55)));
         } else {