liuzhenxing 3 жил өмнө
parent
commit
093252c5f0

+ 2 - 2
.idea/misc.xml

@@ -15,13 +15,13 @@
         <entry key="app/src/main/res/layout/item_connections.xml" value="0.19300911854103345" />
         <entry key="app/src/main/res/layout/item_icon.xml" value="0.25" />
         <entry key="app/src/main/res/layout/item_icon_title.xml" value="0.19300911854103345" />
-        <entry key="app/src/main/res/layout/item_icon_title_right.xml" value="0.25769927536231885" />
+        <entry key="app/src/main/res/layout/item_icon_title_right.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_icon_title_subtitle.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_refresh.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_switch.xml" value="0.20199275362318841" />
         <entry key="app/src/main/res/layout/item_title.xml" value="0.25769927536231885" />
         <entry key="app/src/main/res/layout/item_title_about.xml" value="0.396875" />
-        <entry key="app/src/main/res/layout/item_title_subtitle.xml" value="0.75" />
+        <entry key="app/src/main/res/layout/item_title_subtitle.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_wifi_switch.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_xpstyle.xml" value="0.20199275362318841" />
       </map>

+ 1 - 0
app/src/main/java/com/xplora/xpsettings/Activity/DisplayActivity.java

@@ -33,6 +33,7 @@ public class DisplayActivity extends BaseActivity {
         for (int i = 0; i < stringList.length; i++) {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
+            model.icon = R.drawable.settings_icon_0;
             model.cellType = i == 0 ? Constant.CellType.ICON_TITLE_RIGHT : Constant.CellType.SWITCH;
             mData.add(model);
         }

+ 7 - 11
app/src/main/res/layout/item_icon_title_right.xml

@@ -6,9 +6,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_height="40dp"
         >
 
         <ImageView
@@ -16,23 +14,21 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_centerVertical="true"
-            android:layout_marginStart="7.5dp"
-            android:src="@drawable/settings_pulse"
+            android:layout_marginStart="20dp"
             />
 
         <TextView
             android:id="@+id/item_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_toEndOf="@id/item_icon"
+            android:layout_marginStart="0dp"
+            android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginEnd="8dp"
+            android:textAlignment="center"
             android:fontFamily="Roboto"
-            android:layout_centerVertical="true"
             android:textColor="@color/white"
-            android:textSize="12sp"
-            android:textFontWeight="700"
-            tools:ignore="SmallSp"
-            />
+            android:textSize="13sp" />
 
     </RelativeLayout>
 

+ 3 - 3
app/src/main/res/layout/item_refresh.xml

@@ -6,8 +6,6 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginLeft="15dp"
-        android:layout_marginRight="15dp"
         >
 
         <TextView
@@ -15,8 +13,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
-            android:fontFamily="Roboto"
+            android:layout_marginStart="20dp"
             android:layout_centerVertical="true"
+            android:fontFamily="Roboto"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -26,6 +25,7 @@
             android:layout_height="15dp"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
+            android:layout_marginEnd="20dp"
             android:background="@drawable/ic_refresh"
             >
         </Button>

+ 1 - 1
app/src/main/res/layout/item_switch.xml

@@ -13,7 +13,7 @@
             android:id="@+id/item_switch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="14dp"
+            android:layout_marginStart="20dp"
             android:layout_centerVertical="true"
             android:thumb="@drawable/selector_switch_thumb"
             android:track="@drawable/selector_switch_track">

+ 3 - 5
app/src/main/res/layout/item_title.xml

@@ -7,17 +7,15 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
         >
 
         <TextView
             android:id="@+id/item_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:fontFamily="Roboto"
+            android:layout_marginStart="20dp"
             android:layout_centerVertical="true"
+            android:fontFamily="Roboto"
             android:textColor="@color/white"
             android:textSize="13sp" />
 
@@ -27,9 +25,9 @@
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"
             android:layout_marginEnd="8dp"
-            android:fontFamily="Roboto"
             android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
+            android:fontFamily="Roboto"
             android:textColor="@color/white"
             android:textSize="10sp"
             tools:ignore="RelativeOverlap" />

+ 2 - 4
app/src/main/res/layout/item_title_subtitle.xml

@@ -7,15 +7,13 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
         >
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="20dp"
             >
 
             <TextView
@@ -33,8 +31,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="5dp"
-                android:fontFamily="Roboto"
                 android:layout_centerVertical="true"
+                android:fontFamily="Roboto"
                 android:textColor="@color/white"
                 android:textSize="12sp"
                 android:textFontWeight="400"