From d7d36f32a3136a8324ff776f531b7afd1897a1e1 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Wed, 27 Nov 2019 00:03:20 +0800
Subject: [PATCH] fix bugs

---
 app/src/main/AndroidManifest.xml                          | 2 +-
 app/src/main/java/com/github/kr328/clash/MainActivity.kt  | 2 +-
 app/src/main/java/com/github/kr328/clash/ProxyActivity.kt | 2 +-
 app/src/main/res/layout/activity_main_clash_status.xml    | 2 +-
 app/src/main/res/values/colors.xml                        | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 160e535..1c15fa3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
             android:name=".MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="portrait"
-            android:launchMode="singleInstance">
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index 4ed2cf4..6f4fe4c 100644
--- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -76,7 +76,7 @@ class MainActivity : BaseActivity() {
                     activity_main_clash_logs.visibility = View.VISIBLE
                 }
                 else -> {
-                    activity_main_clash_status.setCardBackgroundColor(Color.GRAY)
+                    activity_main_clash_status.setCardBackgroundColor(getColor(R.color.gray))
                     activity_main_clash_status_icon.setImageResource(R.drawable.ic_clash_stopped)
                     activity_main_clash_status_title.text = getString(R.string.clash_status_stopped)
                     activity_main_clash_status_summary.text =
diff --git a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
index 1cd96a5..8b146dc 100644
--- a/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProxyActivity.kt
@@ -14,6 +14,6 @@ class ProxyActivity : BaseActivity() {
 
         content.layoutManager = LinearLayoutManager(this)
 
-        
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_clash_status.xml b/app/src/main/res/layout/activity_main_clash_status.xml
index c53805c..7b3584d 100644
--- a/app/src/main/res/layout/activity_main_clash_status.xml
+++ b/app/src/main/res/layout/activity_main_clash_status.xml
@@ -11,7 +11,7 @@
     android:focusable="true"
     app:cardElevation="4dp"
     app:cardCornerRadius="8dp"
-    app:cardBackgroundColor="@android:color/darker_gray">
+    app:cardBackgroundColor="@color/gray">
 
     <RelativeLayout
         android:paddingStart="18dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e77297b..e227b74 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,4 +6,5 @@
     <color name="ic_launcher_background">#FFFFFF</color>
 
     <color name="lightGray">#d3d3d3</color>
+    <color name="gray">#FF888888</color>
 </resources>