1

.idea/misc.xml

@@ -19,6 +19,8 @@
         <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.1" />
         <entry key="app/src/main/res/layout/item_icon_title_subtitle.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/item_progress_title.xml" value="0.17307692307692307" />
+        <entry key="app/src/main/res/layout/item_progress_title_subtitle.xml" value="0.1331521739130435" />
         <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" />

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

@@ -21,9 +21,6 @@ public class ConnectionsActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
-
-        ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
-
         initData();
         initView();
     }

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

@@ -29,9 +29,6 @@ public class SoundModeActivity extends BaseActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
-
-        ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
-
         initData();
         initView();
     }

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

@@ -5,7 +5,8 @@ import android.os.Bundle;
 import android.widget.ListView;
 
 import com.xplora.xpsettings.Adapter.BaseListAdapter;
-import com.xplora.xpsettings.Model.BaseModel;
+import com.xplora.xpsettings.Model.IconProgressModel;
+import com.xplora.xpsettings.Model.IconProgressModel;
 import com.xplora.xpsettings.R;
 import com.xplora.xpsettings.Utils.Constant;
 import com.xplora.xpsettings.Utils.ResUtils;
@@ -15,27 +16,27 @@ import java.util.List;
 
 
 public class VolumeActivity extends BaseActivity {
-    private final List<BaseModel> mData = new ArrayList<>();
+    private final List<IconProgressModel> mData = new ArrayList<>();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_list);
-
-        ResUtils.initResUtils(this, Constant.PACKAGE_NAME);
-
         initData();
         initView();
     }
 
     private void initData() {
+        String[] ringTone = getResources().getStringArray(R.array.ringtone_title_array);
         String[] stringList = getResources().getStringArray(R.array.volume_title_array);
         for (int i = 0; i < stringList.length; i++) {
-            BaseModel model = new BaseModel();
+            IconProgressModel model = new IconProgressModel();
             model.title = stringList[i].trim();
+            model.subTitle = ringTone[0];
             model.icon = ResUtils.getImageId("volume_", i);
-            model.cellType = Constant.CellType.ICON_TITLE_SUBTITLE;
+            model.progress = 60;
             model.isShowArrow = false;
+            model.cellType = Constant.CellType.PROGRESS_TITLE_SUBTITLE;
             mData.add(model);
         }
     }

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

@@ -56,6 +56,8 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_icon_title_subtitle, null);
         }else if (model.cellType == Constant.CellType.PROGRESS_TITLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_progress_title, null);
+        }else if (model.cellType == Constant.CellType.PROGRESS_TITLE_SUBTITLE) {
+            view = LayoutInflater.from(getContext()).inflate(R.layout.item_progress_title_subtitle, null);
         } else if (model.cellType == Constant.CellType.XPSTYLE) {
             view = LayoutInflater.from(getContext()).inflate(R.layout.item_xpstyle, null);
         } else if (model.cellType == Constant.CellType.SWITCH) {
@@ -121,7 +123,7 @@ public class BaseListAdapter extends ArrayAdapter<BaseModel> {
         }
         if (iconProgressView != null) {
             iconProgressView.setIcon(model.icon);
-            //iconProgressView.setProgressColor(((IconProgressModel)model).progressColor);
+            iconProgressView.setProgressColor(((IconProgressModel)model).progressColor);
             iconProgressView.setProgress100(((IconProgressModel)model).progress);
         }
         return view;

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

@@ -36,7 +36,7 @@ public class IconProgressView<updata> extends FrameLayout {
     }
 
     public void setProgressColor(int color) {
-        mCircleProgressbar.setProgressColor(color);
+        mCircleProgressbar.setProgressColor(getResources().getColor(color));
     }
 
     public void setNormalColor(int color) {

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

@@ -11,7 +11,6 @@
         android:layout_centerInParent="true"
         app:progress_style="STROKE"
         app:normal_color="#666666"
-        app:progress_color="#FFC34B"
         />
 
     <ImageView

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

@@ -9,10 +9,10 @@
         android:layout_height="40dp"
         >
 
-        <ImageView
-            android:id="@+id/item_icon"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+        <com.xplora.xpsettings.IconProgressView
+            android:id="@+id/item_icon_progress"
+            android:layout_width="29dp"
+            android:layout_height="29dp"
             android:layout_centerVertical="true"
             android:layout_marginStart="20dp"
             />
@@ -21,7 +21,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:layout_toEndOf="@+id/item_icon"
+            android:layout_toEndOf="@+id/item_icon_progress"
             android:layout_alignParentEnd="true"
             >
 
@@ -33,7 +33,7 @@
                 android:fontFamily="Roboto"
                 android:textAlignment="center"
                 android:textColor="@color/white"
-                android:textFontWeight="700"
+                android:textFontWeight="400"
                 android:textSize="12sp" />
 
             <TextView
@@ -44,10 +44,9 @@
                 android:fontFamily="Roboto"
                 android:textAlignment="center"
                 android:layout_centerVertical="true"
-                android:textColor="@color/white"
+                android:textColor="@color/xp_yellow"
                 android:textSize="12sp"
                 android:textFontWeight="400"
-                android:text="subtitle"
                 />
         </LinearLayout>