1

.idea/misc.xml

@@ -11,6 +11,7 @@
         <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" />
+        <entry key="app/src/main/res/layout/item_center.xml" value="0.13179347826086957" />
         <entry key="app/src/main/res/layout/item_checkbox.xml" value="0.20199275362318841" />
         <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" />

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

@@ -39,7 +39,7 @@ public class DisplayActivity extends BaseActivity {
             BaseModel model = new BaseModel();
             model.title = stringList[i].trim();
             if (i == 0) {
-                model.icon = R.drawable.settings_icon_0;
+                model.icon = R.drawable.ic_brightness;
                 model.cellType = Constant.CellType.ICON_TITLE_RIGHT ;
             } else {
                 model.cellType = Constant.CellType.SWITCH;

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

@@ -59,7 +59,7 @@ public class LanguageActivity extends BaseActivity {
     }
 
     private void initView() {
-        mAdapter = new BaseListAdapter(this, R.layout.item_center, mData);
+        mAdapter = new BaseListAdapter(this, 0, mData);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -58,7 +58,7 @@ public class RingToneActivity extends BaseActivity {
     }
 
     private void initView() {
-        mAdapter = new BaseListAdapter(this, R.layout.item_center, mData);
+        mAdapter = new BaseListAdapter(this, 0, mData);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -63,7 +63,7 @@ public class ScreenTimeActivity extends BaseActivity {
     }
 
     private void initView() {
-        mAdapter = new BaseListAdapter(this, R.layout.item_center, mData);
+        mAdapter = new BaseListAdapter(this, 0, mData);
         ListView listView = findViewById(R.id.activity_listview);
         listView.setAdapter(mAdapter);
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {

app/src/main/java/com/xplora/xpsettings/CircleProgressbar.java

@@ -0,0 +1,136 @@
+package com.xplora.xpsettings;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.RectF;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.xplora.xpsettings.R;
+
+/**
+ * https://cloud.tencent.com/developer/article/1153093
+ * 圆形进度条
+ *
+ * @auth dengquan@360.cn
+ * Create by dengquan on 2019/4/1
+ */
+public class CircleProgressbar extends View {
+    private int height;
+    private int width;
+    private Paint mPaint;
+    private int strokeWidth = 5;//线条宽度
+    private RectF rectF;
+    private int normalColor;
+    private int progressColor;
+    private int textColor = normalColor;//文字颜色
+    private float textSize = 20;//文字大小
+    private int progress = 0;//进度条
+    private String centerText = null;//中心填充文字
+    private Paint fontPaint = null;
+    private Paint.Style progress_style = Paint.Style.STROKE;//填充式还是环形式
+
+    public CircleProgressbar(Context context) {
+        this(context, null);
+    }
+
+    public CircleProgressbar(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CircleProgressbar(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+//        TypedArray array = context.obtainStyledAttributes(attrs, R.styleable.CircleProgressbar);
+//        textSize = array.getDimension(R.styleable.CircleProgressbar_text_size, textSize);
+//        textColor = array.getColor(R.styleable.CircleProgressbar_text_color, textColor);
+//        centerText = array.getString(R.styleable.CircleProgressbar_text) == null ? centerText : array.getString(R.styleable.CircleProgressbar_text);
+//        strokeWidth = array.getInteger(R.styleable.CircleProgressbar_stroke_width, strokeWidth);
+//        normalColor = array.getColor(R.styleable.CircleProgressbar_normal_color, normalColor);
+//        progressColor = array.getColor(R.styleable.CircleProgressbar_progress_color, progressColor);
+//        progress = array.getInt(R.styleable.CircleProgressbar_progress, progress);
+//        progress_style = array.getInt(R.styleable.CircleProgressbar_progress_style, 0) == 0 ? Paint.Style.STROKE : Paint.Style.FILL;
+
+        //array.recycle();
+        initPaint();
+    }
+
+    // 2.初始化画笔
+    private void initPaint() {
+        mPaint = new Paint();
+        mPaint.setColor(normalColor);       //设置画笔颜色
+        mPaint.setAntiAlias(true);
+        mPaint.setStyle(progress_style);  //设置画笔模式为描边
+        mPaint.setStrokeWidth(strokeWidth);         //设置画笔宽度为10px
+
+        fontPaint = new Paint();
+        fontPaint.setTextSize(textSize);
+        fontPaint.setAntiAlias(true);
+        fontPaint.setColor(textColor);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        height = MeasureSpec.getSize(heightMeasureSpec);
+        width = MeasureSpec.getSize(widthMeasureSpec);
+
+        if (height > width)//高大于宽的情况
+        {
+            rectF = new RectF(strokeWidth, (height / 2 - width / 2) + strokeWidth, width - strokeWidth, (height / 2 + width / 2) - strokeWidth);
+        } else if (width > height)//宽大于高的情况
+        {
+            rectF = new RectF((width / 2 - height / 2) + strokeWidth, strokeWidth, (width / 2 + height / 2) - strokeWidth, height - strokeWidth);
+        } else//宽等于高的情况
+        {
+            rectF = new RectF(strokeWidth, strokeWidth, width - strokeWidth, height - strokeWidth);
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    Paint.FontMetrics fontMetrics = null;
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+        mPaint.setColor(normalColor);
+        if (progress < 360) {
+            canvas.drawArc(rectF, 270 + progress, 360 - progress, progress_style == Paint.Style.FILL, mPaint);
+        }
+
+        mPaint.setColor(progressColor);
+        canvas.drawArc(rectF, 270, progress, progress_style == Paint.Style.FILL, mPaint);
+
+        fontMetrics = fontPaint.getFontMetrics();
+        if (!TextUtils.isEmpty(centerText)) {
+            float textWidth = fontPaint.measureText(centerText);
+            float textHeight = fontPaint.ascent() + fontPaint.descent();
+            canvas.drawText(centerText, width / 2 - textWidth / 2, height / 2 - textHeight / 2, fontPaint);
+        }
+
+    }
+
+
+    /**
+     * 更新界面
+     *
+     * @param progress
+     * @param text
+     */
+    public void update(int progress, String text) {
+        this.progress = progress;
+        this.centerText = text;
+        postInvalidate();
+    }
+
+    /**
+     * 更新界面
+     *
+     * @param progress
+     */
+    public void update(int progress) {
+        this.progress = progress;
+        postInvalidate();
+    }
+}

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

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

@@ -1,25 +0,0 @@
-<?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">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:background="@drawable/button_shape"
-        >
-
-        <TextView
-            android:id="@+id/item_title"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:fontFamily="Roboto"
-            android:textColor="@color/white"
-            android:textSize="13sp" />
-
-    </FrameLayout>
-
-</LinearLayout>

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

@@ -3,12 +3,11 @@
     android:layout_width="29dp"
     android:layout_height="29dp">
 
-    <ImageView
+    <com.xplora.xpsettings.CircleProgressbar
         android:id="@+id/item_progress"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_centerInParent="true"
-        android:background="@color/xp_red"
         />
 
     <ImageView