1

.idea/misc.xml

@@ -5,8 +5,11 @@
       <map>
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.3546195652173913" />
         <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_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_about.xml" value="0.396875" />
         <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>

app/src/main/AndroidManifest.xml

@@ -107,6 +107,10 @@
             android:name=".Activity.BluetoothActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="standard" />
+        <activity
+            android:name=".Activity.DisplayActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="standard" />
     </application>
 
 </manifest>

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

@@ -71,7 +71,7 @@ public class BluetoothActivity extends BaseActivity {
         for (int i = 0; i < 10; i++) {
             BluetoothModel model = new BluetoothModel();
             model.title = "aaaa";
-            model.cellType = Constant.CellType.DEFAULT_SUBTITLE;
+            model.cellType = Constant.CellType.ICON_TITLE_SUBTITLE;
             mData.add(model);
         }
     }

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

@@ -0,0 +1,59 @@
+package com.xplora.xpsettings.Activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.ListView;
+
+import com.xplora.xpsettings.Adapter.BaseListAdapter;
+import com.xplora.xpsettings.Model.BaseModel;
+import com.xplora.xpsettings.R;
+import com.xplora.xpsettings.Utils.Constant;
+import com.xplora.xpsettings.Utils.ResUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class DisplayActivity extends BaseActivity {
+    private final List<BaseModel> mData = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.list_activity);
+
+        ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
+
+        initData();
+        initView();
+    }
+
+    private void initData() {
+        String[] stringList = getResources().getStringArray(R.array.display_title_array);
+        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;
+            mData.add(model);
+        }
+    }
+
+    private void initView() {
+        //list
+        BaseListAdapter adapter = new BaseListAdapter(this, R.layout.item_xpstyle, mData);
+        ListView listView = findViewById(R.id.list_view);
+        listView.setAdapter(adapter);
+
+        listView.setOnItemClickListener((adapterView, view, i, l) -> {
+            Intent intent;
+            switch (i) {
+                case 0:
+                    intent = new Intent(this, BrightActivity.class);
+                    startActivity(intent);
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+}

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

@@ -40,7 +40,7 @@ public class SettingsActivity extends BaseActivity {
 
     private void initView() {
         //list
-        BaseListAdapter adapter = new BaseListAdapter(SettingsActivity.this, R.layout.item_xpstyle, mData);
+        BaseListAdapter adapter = new BaseListAdapter(this, R.layout.item_xpstyle, mData);
         ListView listView = findViewById(R.id.list_view);
         listView.setAdapter(adapter);
 
@@ -48,23 +48,23 @@ public class SettingsActivity extends BaseActivity {
             Intent intent;
             switch (i) {
                 case 0:
-                    intent = new Intent(SettingsActivity.this, ConnectionsActivity.class);
+                    intent = new Intent(this, ConnectionsActivity.class);
                     startActivity(intent);
                     break;
                 case 2:
-                    intent = new Intent(SettingsActivity.this, BrightActivity.class);
+                    intent = new Intent(this, DisplayActivity.class);
                     startActivity(intent);
                     break;
                 case 4:
-                    intent = new Intent(SettingsActivity.this, QRActivity.class);
+                    intent = new Intent(this, QRActivity.class);
                     startActivity(intent);
                     break;
                 case 8:
-                    intent = new Intent(SettingsActivity.this, AboutActivity.class);
+                    intent = new Intent(this, AboutActivity.class);
                     startActivity(intent);
                     break;
                 case 10:
-                    intent = new Intent(SettingsActivity.this, ScreenTimeActivity.class);
+                    intent = new Intent(this, ScreenTimeActivity.class);
                     startActivity(intent);
                     break;
                 default:

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

@@ -38,11 +38,17 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
         if (model.cellType == Constant.CellType.XPSTYLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_xpstyle, null);
         }
-        if (model.cellType == Constant.CellType.SWITCH) {
+        else if (model.cellType == Constant.CellType.SWITCH) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_switch, null);
         }
-        else {
-            view = LayoutInflater.from(getContext()).inflate(R.layout.item_xpstyle, null);
+        else if (model.cellType == Constant.CellType.REFRESH) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_refresh, null);
+        }
+        else if (model.cellType == Constant.CellType.ICON_TITLE) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title, null);
+        }
+        else if (model.cellType == Constant.CellType.ICON_TITLE_SUBTITLE) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title_subtitle, null);
         }
 
         TextView itemTitle = view.findViewById(R.id.item_title);

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

@@ -5,7 +5,8 @@ public class Constant {
 
     public enum CellType {
         DEFAULT,
-        DEFAULT_SUBTITLE,
+        ICON_TITLE,
+        ICON_TITLE_SUBTITLE,
         XPSTYLE,
         SWITCH,
         CHECKBOX,

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

@@ -0,0 +1,59 @@
+<?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"
+        android:background="@drawable/button_shape"
+        >
+
+        <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_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_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:textColor="@color/white"
+            android:textSize="10sp"
+            tools:ignore="SmallSp" />
+
+        <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>

app/src/main/res/values/arrays.xml

@@ -31,6 +31,11 @@
         <item>Data Roaming</item>
     </string-array>
 
+    <string-array name="display_title_array">
+        <item>Brightness</item>
+        <item>App Name</item>
+    </string-array>
+
     <string-array name="screen_time_value_array">
         <item>5s</item>
         <item>15s</item>