刘振兴 3 жил өмнө
parent
commit
8be2417066

+ 3 - 0
.idea/misc.xml

@@ -12,9 +12,12 @@
         <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_subtitle.xml" value="0.25769927536231885" />
         <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_wifi_switch.xml" value="0.1" />
         <entry key="app/src/main/res/layout/item_xpstyle.xml" value="0.20199275362318841" />
       </map>

+ 1 - 1
app/src/main/java/com/xplora/xpsettings/Adapter/ListAdapter.java

@@ -68,7 +68,7 @@ public class ListAdapter extends ArrayAdapter<BaseModel> {
         }
 
         TextView itemTitle = view.findViewById(R.id.item_title);
-        TextView itemDetailTitle = view.findViewById(R.id.item_title_detail);
+        TextView itemDetailTitle = view.findViewById(R.id.item_detail);
         ImageView itemIcon = view.findViewById(R.id.item_icon);
         ImageView itemArrow = view.findViewById(R.id.item_arrow);
 

+ 2 - 2
app/src/main/res/layout/item_checkbox.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="40dp">
+    android:layout_height="36dp">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="match_parent"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         >

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

@@ -9,7 +9,6 @@
         android:layout_height="35dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:background="@drawable/button_shape"
         >
 
         <ImageView
@@ -33,7 +32,7 @@
             android:textSize="13sp" />
 
         <TextView
-            android:id="@+id/item_title_detail"
+            android:id="@+id/item_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"
@@ -42,7 +41,8 @@
             android:layout_centerVertical="true"
             android:textColor="@color/white"
             android:textSize="10sp"
-            tools:ignore="SmallSp" />
+            tools:ignore="SmallSp"
+            />
 
         <ImageView
             android:id="@+id/item_arrow"

+ 29 - 8
app/src/main/res/layout/item_icon_title_subtitle.xml

@@ -9,7 +9,6 @@
         android:layout_height="35dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:background="@drawable/button_shape"
         >
 
         <ImageView
@@ -21,19 +20,41 @@
             android:src="@drawable/settings_pulse"
             />
 
-        <TextView
-            android:id="@+id/item_title"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:orientation="vertical"
             android:layout_toEndOf="@+id/item_icon"
             android:layout_marginStart="8dp"
-            android:fontFamily="Roboto"
-            android:layout_centerVertical="true"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
+            >
+
+            <TextView
+                android:id="@+id/item_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="Roboto"
+                android:textColor="@color/white"
+                android:textFontWeight="700"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/item_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:fontFamily="Roboto"
+                android:layout_centerVertical="true"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                android:textFontWeight="400"
+                android:text="subtitle"
+                />
+        </LinearLayout>
+
 
         <TextView
-            android:id="@+id/item_title_detail"
+            android:id="@+id/item_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"

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

@@ -2,11 +2,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="40dp">
+    android:layout_height="36dp">
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="40dp"
+        android:layout_height="match_parent"
         android:layout_marginLeft="15dp"
         android:layout_marginRight="15dp"
         >

+ 1 - 2
app/src/main/res/layout/item_title.xml

@@ -9,7 +9,6 @@
         android:layout_height="40dp"
         android:layout_marginLeft="2dp"
         android:layout_marginRight="2dp"
-        android:background="@drawable/button_shape"
         >
 
         <TextView
@@ -23,7 +22,7 @@
             android:textSize="13sp" />
 
         <TextView
-            android:id="@+id/item_title_detail"
+            android:id="@+id/item_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"

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

@@ -24,7 +24,7 @@
             tools:ignore="SmallSp" />
 
         <TextView
-            android:id="@+id/item_title_detail"
+            android:id="@+id/item_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_toStartOf="@+id/item_arrow"

+ 69 - 49
app/src/main/res/layout/item_title_subtitle.xml

@@ -1,50 +1,70 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="40dp">
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginLeft="2dp"
-        android:layout_marginRight="2dp"
-        android:background="@drawable/button_shape"
-        >
-
-        <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_centerVertical="true"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
-
-        <TextView
-            android:id="@+id/item_title_detail"
-            android:layout_width="wrap_content"
-            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:textColor="@color/white"
-            android:textSize="10sp"
-            tools:ignore="RelativeOverlap" />
-
-        <ImageView
-            android:id="@+id/item_arrow"
-            android:layout_width="6dp"
-            android:layout_height="10dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginEnd="9.5dp"
-            android:src="@drawable/icon_arrow"
-            />
-
-    </RelativeLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="40dp">
+
+    <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"
+            >
+
+            <TextView
+                android:id="@+id/item_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:fontFamily="Roboto"
+                android:textColor="@color/white"
+                android:textFontWeight="700"
+                android:textSize="12sp" />
+
+            <TextView
+                android:id="@+id/item_subtitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dp"
+                android:fontFamily="Roboto"
+                android:layout_centerVertical="true"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                android:textFontWeight="400"
+                android:text="subtitle"
+                />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/item_detail"
+            android:layout_width="wrap_content"
+            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:textColor="@color/white"
+            android:textSize="10sp"
+            tools:ignore="RelativeOverlap" />
+
+        <ImageView
+            android:id="@+id/item_arrow"
+            android:layout_width="6dp"
+            android:layout_height="10dp"
+            android:layout_centerVertical="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="9.5dp"
+            android:src="@drawable/icon_arrow"
+            />
+
+    </RelativeLayout>
+
 </LinearLayout>