gui

app/src/main/java/com/xplora/xpsettings/Activity/WiFiActivity.java

@@ -160,7 +160,7 @@ public class WiFiActivity extends BaseActionActivity {
         switchModel.isOn = isOn;
         switchModel.value = "";
         switchModel.status = WifiModel.STATUS.NA;
-        switchModel.cellType = Constant.CellType.SWITCH;
+        switchModel.cellType = Constant.CellType.SWITCH_RIGHT;
         mDataList.add(switchModel);
 
 /*        WifiModel test = new WifiModel();

app/src/main/res/layout/activity_adjust_seekbar.xml

@@ -20,7 +20,6 @@
         android:layout_marginTop="6dp"
         android:textSize="15sp"
         android:textColor="#FFFFFFFF"
-        android:fontFamily="Roboto"
         android:textStyle="bold"
         />
 

app/src/main/res/layout/activity_list.xml

@@ -9,7 +9,7 @@
         android:id="@+id/activity_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="25dp"
         android:scrollbarThumbVertical="@color/xp_yellow"
         >
     </ListView>
@@ -30,7 +30,6 @@
             android:textSize="12sp"
             android:textFontWeight="400"
             android:textColor="#FFFFFFFF"
-            android:fontFamily="Roboto"
             android:textAlignment="center"
             />
 
@@ -44,7 +43,6 @@
             android:textSize="20sp"
             android:textFontWeight="400"
             android:textColor="#FFFFFFFF"
-            android:fontFamily="Roboto"
             android:text="+"
             android:backgroundTint="@color/xp_green"
             style="@style/xp_style_button_all"
@@ -61,7 +59,6 @@
         android:textSize="12sp"
         android:textFontWeight="400"
         android:textColor="#FFFFFFFF"
-        android:fontFamily="Roboto"
         android:backgroundTint="@color/xp_green"
         style="@style/xp_style_button_all"
         android:visibility="gone"
@@ -97,7 +94,6 @@
             android:textSize="10sp"
             android:textFontWeight="500"
             android:textColor="@color/black"
-            android:fontFamily="Roboto"
             android:textAlignment="textStart"
             android:text="@string/ringtone_click"
             />

app/src/main/res/layout/activity_list_title.xml

@@ -15,12 +15,11 @@
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="25dp"
             android:textAlignment="center"
             android:textSize="17sp"
             android:textStyle="bold"
             android:textColor="#FFFFFFFF"
-            android:fontFamily="Roboto"
             android:visibility="gone"
             />
 
@@ -52,7 +51,6 @@
             android:textSize="12sp"
             android:textFontWeight="400"
             android:textColor="#FFFFFFFF"
-            android:fontFamily="Roboto"
             android:textAlignment="center"
             />
 
@@ -66,7 +64,6 @@
             android:textSize="12sp"
             android:textFontWeight="400"
             android:textColor="#FFFFFFFF"
-            android:fontFamily="Roboto"
             android:text="+"
             android:backgroundTint="@color/xp_green"
             style="@style/xp_style_button_all"

app/src/main/res/layout/item_connections.xml

@@ -22,8 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="12dp"
-            android:fontFamily="Roboto"
-            android:textFontWeight="700"
+            android:textStyle="bold"
             android:textColor="@color/white"
             android:textSize="11dp" />
 

app/src/main/res/layout/item_icon_title.xml

@@ -31,10 +31,10 @@
             android:layout_marginStart="8dp"
             android:layout_toStartOf="@+id/item_detail"
             android:layout_marginEnd="8dp"
-            android:fontFamily="Roboto"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
             android:textSize="17sp"
+            android:textStyle="bold"
             android:ellipsize="marquee"
             android:marqueeRepeatLimit="marquee_forever"
             android:singleLine="true"
@@ -47,7 +47,6 @@
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"
             android:layout_marginEnd="8dp"
-            android:fontFamily="Roboto"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
             android:textSize="10sp"

app/src/main/res/layout/item_progress_title.xml

@@ -20,6 +20,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
             android:layout_centerVertical="true"
+            android:textStyle="bold"
             android:textAlignment="textStart"
             android:textColor="@color/white"
             android:textSize="17sp" />

app/src/main/res/layout/item_progress_title_subtitle.xml

@@ -33,7 +33,7 @@
                 android:fontFamily="Roboto"
                 android:textAlignment="center"
                 android:textColor="@color/white"
-                android:textFontWeight="400"
+                android:textStyle="bold"
                 android:textSize="12sp" />
 
             <TextView

app/src/main/res/layout/item_switch_right.xml

@@ -21,6 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="6dp"
+            android:textStyle="bold"
             android:textAlignment="textStart"
             android:textColor="@color/white"
             android:textSize="17sp" />

app/src/main/res/layout/item_title.xml

@@ -20,8 +20,8 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginStart="6dp"
-            android:fontFamily="Roboto"
             android:textColor="@color/white"
+            android:textStyle="bold"
             android:textSize="17sp" />
 
         <TextView

app/src/main/res/layout/item_title_subtitle.xml

@@ -26,9 +26,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="20dp"
-                android:fontFamily="Roboto"
                 android:textColor="@color/white"
-                android:textFontWeight="400"
+                android:textStyle="bold"
                 android:textSize="17sp"
                 android:ellipsize="end"
                 android:maxLines="1"
@@ -40,7 +39,6 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
                 android:layout_marginEnd="5dp"
-                android:fontFamily="Roboto"
                 android:textColor="#B2FFFFFF"
                 android:textSize="14sp"
                 android:textFontWeight="400"

app/src/main/res/values-zh-rCN/strings.xml

@@ -164,10 +164,10 @@
     <string name="software_wifi_error_array_1">请先打开Wi-Fi</string>
     <string name="timeformat_title_array_0">12小时</string>
     <string name="timeformat_title_array_1">24小时</string>
-    <string name="sk_settings_title_array_0">连接</string>
-    <string name="sk_settings_title_array_1">通话与网络</string>
+    <string name="sk_settings_title_array_0">网络连接</string>
+    <string name="sk_settings_title_array_1">通话设置</string>
     <string name="sk_settings_title_array_2">声音与震动</string>
-    <string name="sk_settings_title_array_3">显示与亮度</string>
+    <string name="sk_settings_title_array_3">显示设置</string>
     <string name="sk_settings_title_array_4">系统设置</string>
     <string name="sk_settings_title_array_5">语言设置</string>
     <string name="sk_settings_title_array_6">设备二维码</string>