1

.idea/misc.xml

@@ -5,6 +5,7 @@
       <map>
         <entry key="../../../.gradle/caches/transforms-3/dae954c5fd9608ef94a7528c5de015a2/transformed/xplibcommon/res/drawable/selector_switch_thumb.xml" value="0.12" />
         <entry key="app/src/main/res/layout/activity_change_progress.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/activity_display.xml" value="0.25769927536231885" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3546195652173913" />
         <entry key="app/src/main/res/layout/bright_activity.xml" value="0.1889564336372847" />
         <entry key="app/src/main/res/layout/display_activity.xml" value="0.20199275362318841" />
@@ -12,6 +13,7 @@
         <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_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" />

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

@@ -23,7 +23,7 @@ public class AboutActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         //标题
         setWatchTitle(getResources().getStringArray(R.array.settings_title_array)[5]);
@@ -62,7 +62,7 @@ public class AboutActivity extends BaseActivity {
     private void initView() {
         //list
         ListAdapter adapter = new ListAdapter(AboutActivity.this, R.layout.item_title_about, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -30,7 +30,7 @@ public class BluetoothActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         initData();
         initView();
@@ -79,7 +79,7 @@ public class BluetoothActivity extends BaseActivity {
     private void initView() {
         //list
         adapter = new BluetoothAdapter(BluetoothActivity.this, 0, mData, handler);
-        listView = findViewById(R.id.list_view);
+        listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -20,7 +20,7 @@ public class ConnectionsActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
 
@@ -41,7 +41,7 @@ public class ConnectionsActivity extends BaseActivity {
     private void initView() {
         //list
         ConnectionsAdapter adapter = new ConnectionsAdapter(ConnectionsActivity.this, R.layout.item_xpstyle, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -17,7 +17,7 @@ public class DataRoamingActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         initData();
         initView();
@@ -35,7 +35,7 @@ public class DataRoamingActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(DataRoamingActivity.this, R.layout.item_xpstyle, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
     }
 }

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

@@ -20,7 +20,7 @@ public class DisplayActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.display_activity);
+        setContentView(R.layout.activity_display);
 
         ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
 
@@ -33,7 +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.cellType = i == 0 ? Constant.CellType.ICON_TITLE : Constant.CellType.SWITCH;
+            model.cellType = i == 0 ? Constant.CellType.ICON_TITLE_RIGHT : Constant.CellType.SWITCH;
             mData.add(model);
         }
     }
@@ -41,7 +41,7 @@ public class DisplayActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(this, R.layout.item_xpstyle, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -20,7 +20,7 @@ public class RingToneActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
 
@@ -41,7 +41,7 @@ public class RingToneActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(this, 0, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -22,7 +22,7 @@ public class ScreenTimeActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         //标题
         setWatchTitle(getResources().getStringArray(R.array.settings_title_array)[2]);
@@ -60,7 +60,7 @@ public class ScreenTimeActivity extends BaseActivity {
                 adapter.notifyDataSetInvalidated();
             }
         }
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -20,7 +20,7 @@ public class SettingsActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         initData();
         initView();
@@ -41,7 +41,7 @@ public class SettingsActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(this, R.layout.item_xpstyle, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -20,7 +20,7 @@ public class SoundModeActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.display_activity);
+        setContentView(R.layout.activity_list);
 
         ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
 
@@ -51,7 +51,7 @@ public class SoundModeActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(this, R.layout.item_xpstyle, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -36,7 +36,7 @@ public class TestToolsActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
         setWatchTitle(getString(R.string.title_testtools));
 
         initData();
@@ -66,7 +66,7 @@ public class TestToolsActivity extends BaseActivity {
     private void initView() {
         //list
         ListAdapter adapter = new ListAdapter(TestToolsActivity.this, R.layout.item_title, mData, handler);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -20,7 +20,7 @@ public class VolumeActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
 
         ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
 
@@ -42,7 +42,7 @@ public class VolumeActivity extends BaseActivity {
     private void initView() {
         //list
         BaseListAdapter adapter = new BaseListAdapter(this, 0, mData);
-        ListView listView = findViewById(R.id.list_view);
+        ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

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

@@ -57,7 +57,7 @@ public class WiFiActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.list_activity);
+        setContentView(R.layout.activity_list);
         initWiFi();
         initData(true);
         initView();
@@ -256,7 +256,7 @@ public class WiFiActivity extends BaseActivity {
 
         //list
         adapter = new WiFiAdapter(WiFiActivity.this, 0, mData, handler);
-        listView = findViewById(R.id.list_view);
+        listView = findViewById(R.id.activity_listview);
         listView.setAdapter(adapter);
 
         listView.setOnItemClickListener((adapterView, view, i, l) -> {

app/src/main/java/com/xplora/xpsettings/Adapter/BaseListAdapter.java

@@ -47,6 +47,8 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
         }
         else if (model.cellType == Constant.CellType.ICON_TITLE_SUBTITLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title_subtitle, null);
+        }else if (model.cellType == Constant.CellType.ICON_TITLE_RIGHT) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title_right, null);
         } else if (model.cellType == Constant.CellType.XPSTYLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_xpstyle, null);
         }

app/src/main/java/com/xplora/xpsettings/Utils/Constant.java

@@ -14,6 +14,7 @@ public class Constant {
         TITLE_SUBTITLE,
         ICON_TITLE,
         ICON_TITLE_SUBTITLE,
+        ICON_TITLE_RIGHT,
         XPSTYLE,
         SWITCH,
         CHECKBOX,

app/src/main/res/layout/display_activity.xml → app/src/main/res/layout/activity_display.xml

@@ -7,7 +7,7 @@
     >
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/activity_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="45dp"
@@ -21,7 +21,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:layout_marginBottom="20dp"
+        android:layout_marginTop="20dp"
         android:textSize="10dp"
         android:textColor="#FFFFFFFF"
         android:fontFamily="Roboto"

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

@@ -19,7 +19,7 @@
         />
 
     <ListView
-        android:id="@+id/list_view"
+        android:id="@+id/activity_listview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="45dp"

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

@@ -0,0 +1,39 @@
+<?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="35dp"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
+        >
+
+        <ImageView
+            android:id="@+id/item_icon"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="7.5dp"
+            android:src="@drawable/settings_pulse"
+            />
+
+        <TextView
+            android:id="@+id/item_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="8dp"
+            android:fontFamily="Roboto"
+            android:layout_centerVertical="true"
+            android:textColor="@color/white"
+            android:textSize="12sp"
+            android:textFontWeight="700"
+            tools:ignore="SmallSp"
+            />
+
+    </RelativeLayout>
+
+</LinearLayout>