From ffcb73718eba874420e4e2d5a7742f17d1a7d150 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Thu, 5 Mar 2020 22:32:03 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values/array_values.xml | 42 +++++++++++++++++++
 app/src/main/res/values/arrays.xml       | 52 ++++--------------------
 app/src/main/res/values/attrs.xml        |  9 ++++
 3 files changed, 58 insertions(+), 45 deletions(-)
 create mode 100644 app/src/main/res/values/array_values.xml

diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml
new file mode 100644
index 000000000..2aa918837
--- /dev/null
+++ b/app/src/main/res/values/array_values.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="icons">
+        <item>ic_launcher</item>
+        <item>launcher1</item>
+        <item>launcher2</item>
+        <item>launcher3</item>
+    </string-array>
+
+
+    <string-array name="screen_time_out_value">
+        <item>0</item>
+        <item>60</item>
+        <item>120</item>
+        <item>180</item>
+        <item>-1</item>
+    </string-array>
+
+    <string-array name="theme_mode_v">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="tts_speech_per_value">
+        <item>0</item>
+        <item>1</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>103</item>
+        <item>106</item>
+        <item>110</item>
+        <item>111</item>
+        <item>11</item>
+        <item>6</item>
+        <item>9</item>
+    </string-array>
+
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 4cd90b40e..15deecdec 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -20,21 +20,6 @@
         <item>百度主持</item>
     </string-array>
 
-    <string-array name="tts_speech_per_value">
-        <item>0</item>
-        <item>1</item>
-        <item>3</item>
-        <item>4</item>
-        <item>5</item>
-        <item>103</item>
-        <item>106</item>
-        <item>110</item>
-        <item>111</item>
-        <item>11</item>
-        <item>6</item>
-        <item>9</item>
-    </string-array>
-
     <string-array name="indent">
         <item>@string/indent_0</item>
         <item>@string/indent_1</item>
@@ -61,12 +46,6 @@
         <item>暗色主题</item>
     </string-array>
 
-    <string-array name="theme_mode_v">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-    </string-array>
-
     <string-array name="NavBarColors">
         <item>自动</item>
         <item>黑色</item>
@@ -82,14 +61,6 @@
         <item>常亮</item>
     </string-array>
 
-    <string-array name="screen_time_out_value">
-        <item>0</item>
-        <item>60</item>
-        <item>120</item>
-        <item>180</item>
-        <item>-1</item>
-    </string-array>
-
     <string-array name="select_folder">
         <item>@string/default_path</item>
         <item>@string/sys_folder_picker</item>
@@ -103,15 +74,6 @@
         <item>@string/screen_sensor</item>
     </string-array>
 
-    <declare-styleable name="Battery">
-        <attr name="batteryOrientation">
-            <enum name="horizontal" value="0" />
-            <enum name="vertical" value="1" />
-        </attr>
-        <attr name="batteryColor" format="color" />
-        <attr name="batteryPower" format="integer" />
-    </declare-styleable>
-
     <string-array name="icon_names">
         <item>iconMain</item>
         <item>icon1</item>
@@ -119,13 +81,6 @@
         <item>icon3</item>
     </string-array>
 
-    <string-array name="icons">
-        <item>ic_launcher</item>
-        <item>launcher1</item>
-        <item>launcher2</item>
-        <item>launcher3</item>
-    </string-array>
-
     <string-array name="chinese_mode">
         <item>关闭</item>
         <item>繁体转简体</item>
@@ -137,4 +92,11 @@
         <item>系统衬线字体</item>
         <item>系统等宽字体</item>
     </string-array>
+
+    <string-array name="title_mode">
+        <item>标题靠左</item>
+        <item>标题居中</item>
+        <item>标题隐藏</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index e42a82a0d..966353f4e 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -137,6 +137,15 @@
         <attr name="textColor" format="color" />
     </declare-styleable>
 
+    <declare-styleable name="Battery">
+        <attr name="batteryOrientation">
+            <enum name="horizontal" value="0" />
+            <enum name="vertical" value="1" />
+        </attr>
+        <attr name="batteryColor" format="color" />
+        <attr name="batteryPower" format="integer" />
+    </declare-styleable>
+
     <declare-styleable name="VerticalSeekBar">
         <attr name="seekBarRotation">
             <!-- Clock wise - 90 deg; top = min, bottom = max -->