From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL-ON_Android/Resources/values/colors.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/HDL-ON_Android/Resources/values/colors.xml b/HDL-ON_Android/Resources/values/colors.xml
index bf1bf20..df49583 100644
--- a/HDL-ON_Android/Resources/values/colors.xml
+++ b/HDL-ON_Android/Resources/values/colors.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#2c3e50</color>
-    <color name="colorPrimaryDark">#1B3147</color>
-    <color name="colorAccent">#3498db</color>
+	<color name="colorPrimary">#2c3e50</color>
+	<color name="colorPrimaryDark">#1B3147</color>
+	<color name="colorAccent">#3498db</color>
+	<color name="colorBlack">#FF000000</color>
+	<color name="color_white">#FFFFFF</color>
+	<color name="color_disable">#CCCCCC</color>
+	<color name="color_select">#FB744A</color>
+	<color name="color_default">#FF333333</color>
 </resources>
\ No newline at end of file

--
Gitblit v1.8.0