From 2990db305ea885d11555f065ce3ccaac803c1830 Mon Sep 17 00:00:00 2001
From: Sylvester Yao <admin@ysy950803.cn>
Date: Fri, 13 Jan 2023 12:00:59 +0800
Subject: [PATCH] Replace colors hard code with values-night.

---
 V2rayNG/app/src/main/AndroidManifest.xml      |  8 +++--
 .../kotlin/com/v2ray/ang/ui/BaseActivity.kt   | 30 ++-----------------
 .../app/src/main/res/values-night/colors.xml  |  6 ++++
 V2rayNG/app/src/main/res/values/colors.xml    |  6 ----
 V2rayNG/app/src/main/res/values/styles.xml    | 18 ++---------
 5 files changed, 16 insertions(+), 52 deletions(-)
 create mode 100644 V2rayNG/app/src/main/res/values-night/colors.xml

diff --git a/V2rayNG/app/src/main/AndroidManifest.xml b/V2rayNG/app/src/main/AndroidManifest.xml
index f90f1274..29f9b3a9 100644
--- a/V2rayNG/app/src/main/AndroidManifest.xml
+++ b/V2rayNG/app/src/main/AndroidManifest.xml
@@ -31,13 +31,15 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/AppThemeLight"
+        android:theme="@style/AppThemeDayNight"
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
+
         <activity
-            android:exported="true"
             android:name=".ui.MainActivity"
-            android:launchMode="singleTask">
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@style/AppThemeDayNight.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
index 66d8feb6..65a211f4 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseActivity.kt
@@ -2,12 +2,10 @@ package com.v2ray.ang.ui
 
 import android.content.Context
 import android.os.Build
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
 import android.view.MenuItem
 import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
 import com.v2ray.ang.util.MyContextWrapper
-import com.v2ray.ang.R
 import com.v2ray.ang.util.Utils
 
 abstract class BaseActivity : AppCompatActivity() {
@@ -19,27 +17,6 @@ abstract class BaseActivity : AppCompatActivity() {
         else -> super.onOptionsItemSelected(item)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        checkDarkMode()
-    }
-
-    private fun checkDarkMode() {
-        if (Utils.getDarkModeStatus(this)) {
-            if (this.javaClass.simpleName == "MainActivity") {
-                setTheme(R.style.AppThemeDark_NoActionBar)
-            } else {
-                setTheme(R.style.AppThemeDark)
-            }
-        } else {
-            if (this.javaClass.simpleName == "MainActivity") {
-                setTheme(R.style.AppThemeLight_NoActionBar)
-            } else {
-                setTheme(R.style.AppThemeLight)
-            }
-        }
-    }
-
     @RequiresApi(Build.VERSION_CODES.N)
     override fun attachBaseContext(newBase: Context?) {
         val context = newBase?.let {
@@ -47,7 +24,4 @@ abstract class BaseActivity : AppCompatActivity() {
         }
         super.attachBaseContext(context)
     }
-
-
-
-}
\ No newline at end of file
+}
diff --git a/V2rayNG/app/src/main/res/values-night/colors.xml b/V2rayNG/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..a1beb1c3
--- /dev/null
+++ b/V2rayNG/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorAccent">#12976F</color>
+    <color name="colorBg">#252525</color>
+    <color name="colorText">#CCCCCC</color>
+</resources>
diff --git a/V2rayNG/app/src/main/res/values/colors.xml b/V2rayNG/app/src/main/res/values/colors.xml
index a754f5d6..f65428fb 100644
--- a/V2rayNG/app/src/main/res/values/colors.xml
+++ b/V2rayNG/app/src/main/res/values/colors.xml
@@ -15,10 +15,4 @@
     <color name="colorAccent">#D81B60</color>
     <color name="colorBg">#FFFFFF</color>
     <color name="colorText">#000000</color>
-
-    <color name="colorPrimaryByDark">#2B2B2B</color>
-    <color name="colorPrimaryDarkByDark">#161616</color>
-    <color name="colorAccentByDark">#12976F</color>
-    <color name="colorBgByDark">#252525</color>
-    <color name="colorTextByDark">#CCCCCC</color>
 </resources>
diff --git a/V2rayNG/app/src/main/res/values/styles.xml b/V2rayNG/app/src/main/res/values/styles.xml
index d775e998..2a157914 100644
--- a/V2rayNG/app/src/main/res/values/styles.xml
+++ b/V2rayNG/app/src/main/res/values/styles.xml
@@ -1,5 +1,6 @@
 <resources>
-    <style name="AppThemeLight" parent="Theme.AppCompat.DayNight.DarkActionBar">
+
+    <style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -7,20 +8,7 @@
         <item name="colorMainText">@color/colorText</item>
     </style>
 
-    <style name="AppThemeDark" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <item name="colorPrimary">@color/colorPrimaryByDark</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDarkByDark</item>
-        <item name="colorAccent">@color/colorAccentByDark</item>
-        <item name="colorMainBg">@color/colorBgByDark</item>
-        <item name="colorMainText">@color/colorTextByDark</item>
-    </style>
-
-    <style name="AppThemeLight_NoActionBar" parent="AppThemeLight">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppThemeDark_NoActionBar" parent="AppThemeDark">
+    <style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>