refactor: 🗼 代码格式化

app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java

@@ -1,7 +1,5 @@
 package cc.niushuai.dididone.biz;
 
-import org.json.JSONArray;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,12 +23,11 @@ public class BizGlobal {
     public static final String PROJECT_ICON_COLOR = "projectIconColor";
     public static final Map<Long, Project> CACHE_PROJECT = new HashMap<>();
     public static final Map<Long, Integer> CACHE_PROJECT_COUNT = new HashMap<>();
+    public static int REQUEST_CODE_GENERAL = 1;
 
     private BizGlobal() {
     }
 
-    public static int REQUEST_CODE_GENERAL = 1;
-
     public static void buildCache() {
 
         // 打卡项缓存

app/src/main/java/cc/niushuai/dididone/biz/dao/RecordDao.java

@@ -6,8 +6,8 @@ import androidx.room.Insert;
 import androidx.room.Query;
 
 import java.util.List;
-import cc.niushuai.dididone.biz.entity.Record;
 
+import cc.niushuai.dididone.biz.entity.Record;
 import cc.niushuai.dididone.biz.vo.ProjectCount;
 import io.reactivex.Completable;
 import io.reactivex.Flowable;

app/src/main/java/cc/niushuai/dididone/biz/entity/Project.java

@@ -9,30 +9,25 @@ import cc.niushuai.dididone.util.Snowflake;
 @Entity(tableName = "t_project")
 public class Project {
 
-    public Project() {
-        this.id = Snowflake.next_id();
-        this.deleted = 0;
-        this.createDate = System.currentTimeMillis();
-    }
-
     @PrimaryKey
     private Long id;
-
     @ColumnInfo(name = "name")
     private String name;
-
     @ColumnInfo(name = "icon")
     private String icon;
-
     @ColumnInfo(name = "icon_color")
     private Integer iconColor;
-
     @ColumnInfo(name = "create_date")
     private Long createDate;
-
     @ColumnInfo(name = "deleted")
     private Integer deleted;
 
+    public Project() {
+        this.id = Snowflake.next_id();
+        this.deleted = 0;
+        this.createDate = System.currentTimeMillis();
+    }
+
     public Long getId() {
         return id;
     }

app/src/main/java/cc/niushuai/dididone/biz/entity/Record.java

@@ -9,33 +9,27 @@ import cc.niushuai.dididone.util.Snowflake;
 @Entity(tableName = "t_record")
 public class Record {
 
-    public Record() {
-        this.id = Snowflake.next_id();
-        this.deleted = 0;
-        this.createDate = System.currentTimeMillis();
-    }
-
     @PrimaryKey
     private Long id;
-
     @ColumnInfo(name = "name")
     private String name;
-
     @ColumnInfo(name = "check_date")
     private Long checkDate;
-
     @ColumnInfo(name = "project_id")
     private Long projectId;
-
     @ColumnInfo(name = "description")
     private String description;
-
     @ColumnInfo(name = "create_date")
     private Long createDate;
-
     @ColumnInfo(name = "deleted")
     private Integer deleted;
 
+    public Record() {
+        this.id = Snowflake.next_id();
+        this.deleted = 0;
+        this.createDate = System.currentTimeMillis();
+    }
+
     public Long getId() {
         return id;
     }

app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java

@@ -17,15 +17,12 @@ import com.lxj.xpopup.util.XPopupUtils;
 import com.lxj.xpopup.widget.VerticalRecyclerView;
 import com.mikepenz.iconics.IconicsDrawable;
 
-import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.function.Consumer;
 
 import cc.niushuai.dididone.R;
 import cc.niushuai.dididone.biz.BizGlobal;
 import cc.niushuai.dididone.biz.entity.Project;
-import cc.niushuai.dididone.util.Toasts;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 

app/src/main/java/cc/niushuai/dididone/ui/setting/SettingFragment.java

@@ -10,7 +10,6 @@ import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
 import cc.niushuai.dididone.databinding.FragmentSettingBinding;
-import cc.niushuai.dididone.util.ActivityUtil;
 
 public class SettingFragment extends Fragment {
 

app/src/main/java/cc/niushuai/dididone/ui/setting/icon/IconFragment.java

@@ -8,7 +8,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -16,20 +15,14 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.mikepenz.community_material_typeface_library.CommunityMaterial;
-import com.mikepenz.fontawesome_typeface_library.FontAwesome;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.function.Predicate;
 
-import cc.niushuai.dididone.R;
 import cc.niushuai.dididone.biz.entity.SavedIcon;
 import cc.niushuai.dididone.databinding.FragmentIconBinding;
 import cc.niushuai.dididone.ui.base.InitAndSetListener;

app/src/main/java/cc/niushuai/dididone/ui/setting/icon/recycle/IconRecycleAdapter.java

@@ -28,10 +28,11 @@ import cc.niushuai.dididone.util.XLog;
 public class IconRecycleAdapter extends RecyclerView.Adapter<IconRecycleAdapter.IconRecycleViewHolder> {
 
     public static final Map<String, List<SavedIcon>> ICON_MAP = new HashMap<>();
+    int selectedPosition = -1;
+    int lastSelectedPosition = -1;
     private Class<? extends IIcon> iconClass;
     private List<SavedIcon> savedIconList;
     private Activity activity;
-
     private String selectedIcon;
 
     public IconRecycleAdapter(Activity activity, Class<? extends IIcon> iconClass) {
@@ -40,6 +41,12 @@ public class IconRecycleAdapter extends RecyclerView.Adapter<IconRecycleAdapter.
         change(getIconClassName(iconClass), item -> true);
     }
 
+    public static String getIconClassName(Class<? extends IIcon> iconClass) {
+        String iconClassName = iconClass.getName();
+        return iconClassName.substring(iconClassName.lastIndexOf(".") + 1, iconClassName.indexOf("$"));
+
+    }
+
     public String getSelectedIcon() {
         return selectedIcon;
     }
@@ -66,8 +73,6 @@ public class IconRecycleAdapter extends RecyclerView.Adapter<IconRecycleAdapter.
         return new IconRecycleViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.icon_grid_item, parent, false));
     }
 
-    int selectedPosition = -1;
-    int lastSelectedPosition = -1;
     /**
      * @param holder   The ViewHolder which should be updated to represent the contents of the
      *                 item at the given position in the data set.
@@ -107,18 +112,11 @@ public class IconRecycleAdapter extends RecyclerView.Adapter<IconRecycleAdapter.
         return savedIconList.size();
     }
 
-    public static String getIconClassName(Class<? extends IIcon> iconClass) {
-        String iconClassName = iconClass.getName();
-        return iconClassName.substring(iconClassName.lastIndexOf(".") + 1, iconClassName.indexOf("$"));
-
-    }
-
-
     public class IconRecycleViewHolder extends RecyclerView.ViewHolder {
 
-        private IconGridItemBinding binding;
         protected ImageView iconView;
         protected TextView txtView;
+        private IconGridItemBinding binding;
 
 
         public IconRecycleViewHolder(@NonNull View itemView) {

app/src/main/java/cc/niushuai/dididone/util/Snowflake.java

@@ -26,35 +26,22 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class Snowflake {
     private static final Snowflake snowflake = new Snowflake(0L);
-
-    public static long next_id() {
-        return snowflake.nextId();
-    }
-
-    public static String next_id_str() {
-        return snowflake.nextId() + "";
-    }
-
     /**
      * Start time cut (2020-05-03)
      */
     private final long twepoch = 1588435200000L;
-
     /**
      * The number of bits occupied by workerId
      */
     private final int workerIdBits = 10;
-
     /**
      * The number of bits occupied by timestamp
      */
     private final int timestampBits = 41;
-
     /**
      * The number of bits occupied by sequence
      */
     private final int sequenceBits = 12;
-
     /**
      * Maximum supported machine id, the result is 1023
      */
@@ -78,7 +65,6 @@ public class Snowflake {
      * lowest  12 bit: sequence
      */
     private AtomicLong timestampAndSequence;
-
     /**
      * instantiate an IdWorker using given workerId
      *
@@ -89,6 +75,14 @@ public class Snowflake {
         initWorkerId(workerId);
     }
 
+    public static long next_id() {
+        return snowflake.nextId();
+    }
+
+    public static String next_id_str() {
+        return snowflake.nextId() + "";
+    }
+
     /**
      * init first timestamp and sequence immediately
      */

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

@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
-    <corners
+    <corners android:radius="15dp" />
-        android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@android:color/white" />

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

@@ -3,10 +3,10 @@
     android:height="128dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
+    <path
-      android:fillColor="#FF000000"
+        android:fillColor="#FF000000"
-      android:pathData="M975,240.4a92.1,92.1 0,0 0,-69.2 -94.9,607.5 607.5,0 0,0 -81.7,-4.2v58.2a78.2,78.2 0,0 1,-106.6 69.2,80.3 80.3,0 0,1 -49.2,-75.5v-52.6L355.2,140.7v38.1c0.7,9.2 0.7,18.5 0,27.7 -4.7,42.8 -43.1,73.7 -85.9,69.2 -40.7,-5.3 -70.7,-40.7 -69.2,-81.7L200.1,142.1h-69.2a47.1,47.1 0,0 0,-12.5 0,94.9 94.9,0 0,0 -69.2,93.5v637.7a94.2,94.2 0,0 0,23.6 70.3,94.2 94.2,0 0,0 67.2,31.5h737.4a94.9,94.9 0,0 0,97.6 -101.1L975,240.4zM914,456.5v383.6a59.6,59.6 0,0 1,-6.2 26.3,28.4 28.4,0 0,1 -27,13.9L142.7,880.2a32.6,32.6 0,0 1,-36 -37.4L106.7,399h806.7l0.7,57.5zM914,456.5"/>
+        android:pathData="M975,240.4a92.1,92.1 0,0 0,-69.2 -94.9,607.5 607.5,0 0,0 -81.7,-4.2v58.2a78.2,78.2 0,0 1,-106.6 69.2,80.3 80.3,0 0,1 -49.2,-75.5v-52.6L355.2,140.7v38.1c0.7,9.2 0.7,18.5 0,27.7 -4.7,42.8 -43.1,73.7 -85.9,69.2 -40.7,-5.3 -70.7,-40.7 -69.2,-81.7L200.1,142.1h-69.2a47.1,47.1 0,0 0,-12.5 0,94.9 94.9,0 0,0 -69.2,93.5v637.7a94.2,94.2 0,0 0,23.6 70.3,94.2 94.2,0 0,0 67.2,31.5h737.4a94.9,94.9 0,0 0,97.6 -101.1L975,240.4zM914,456.5v383.6a59.6,59.6 0,0 1,-6.2 26.3,28.4 28.4,0 0,1 -27,13.9L142.7,880.2a32.6,32.6 0,0 1,-36 -37.4L106.7,399h806.7l0.7,57.5zM914,456.5" />
-  <path
+    <path
-      android:fillColor="#FF000000"
+        android:fillColor="#FF000000"
-      android:pathData="M277.7,238.3a47,47 0,0 0,33.1 -15,47 47,0 0,0 12.6,-34.2L323.4,96.4a49.2,49.2 0,0 0,-9 -33.9,44.3 44.3,0 0,0 -50.5,-11.8A46.4,46.4 0,0 0,231.3 95.7v94.2a47.8,47.8 0,0 0,46.4 48.5zM743,238.3a47.1,47.1 0,0 0,33.1 -15,47 47,0 0,0 12.5,-34.2L788.7,96.4a49.2,49.2 0,0 0,-12.5 -33.9,44.3 44.3,0 0,0 -50.5,-11.8 46.4,46.4 0,0 0,-29.1 44.3v94.2a47.8,47.8 0,0 0,13 34.2A47.8,47.8 0,0 0,743 238.3zM728.5,720.3h121.9v94.2L728.5,814.4v-94.2zM542.2,720.3h121.9v94.2L542.2,814.4v-94.2zM355.9,814.4h122.6v-95.6L355.9,718.9v95.6zM169.7,720.3h121.9v94.2L169.7,814.4v-94.2zM728.5,591.5L850.3,591.5v94.2L728.5,685.6v-94.2zM542.2,592.2h121.9v94.2L542.2,686.3v-94.2zM355.9,592.2h121.9v94.2h-121.9v-94.2zM292.2,592.2L170.4,592.2v94.2h121.9v-94.2zM727.8,464.1h121.9v94.2L727.8,558.2v-94.2zM542.2,464.1h121.9v94.2L542.2,558.2v-94.2zM478.5,464.1L355.9,464.1v94.2h122.6v-94.2zM478.5,464.1"/>
+        android:pathData="M277.7,238.3a47,47 0,0 0,33.1 -15,47 47,0 0,0 12.6,-34.2L323.4,96.4a49.2,49.2 0,0 0,-9 -33.9,44.3 44.3,0 0,0 -50.5,-11.8A46.4,46.4 0,0 0,231.3 95.7v94.2a47.8,47.8 0,0 0,46.4 48.5zM743,238.3a47.1,47.1 0,0 0,33.1 -15,47 47,0 0,0 12.5,-34.2L788.7,96.4a49.2,49.2 0,0 0,-12.5 -33.9,44.3 44.3,0 0,0 -50.5,-11.8 46.4,46.4 0,0 0,-29.1 44.3v94.2a47.8,47.8 0,0 0,13 34.2A47.8,47.8 0,0 0,743 238.3zM728.5,720.3h121.9v94.2L728.5,814.4v-94.2zM542.2,720.3h121.9v94.2L542.2,814.4v-94.2zM355.9,814.4h122.6v-95.6L355.9,718.9v95.6zM169.7,720.3h121.9v94.2L169.7,814.4v-94.2zM728.5,591.5L850.3,591.5v94.2L728.5,685.6v-94.2zM542.2,592.2h121.9v94.2L542.2,686.3v-94.2zM355.9,592.2h121.9v94.2h-121.9v-94.2zM292.2,592.2L170.4,592.2v94.2h121.9v-94.2zM727.8,464.1h121.9v94.2L727.8,558.2v-94.2zM542.2,464.1h121.9v94.2L542.2,558.2v-94.2zM478.5,464.1L355.9,464.1v94.2h122.6v-94.2zM478.5,464.1" />
 </vector>

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

@@ -3,7 +3,7 @@
     android:height="128dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
+    <path
-      android:pathData="M438,697.5 L438,697.5 438,586.7 327.2,586.7c-61.2,0 -110.8,49.6 -110.8,110.8 0,61.2 49.6,110.8 110.8,110.8C388.4,808.3 438,758.7 438,697.5L438,697.5 438,697.5 438,697.5zM493.4,697.5c0,91.8 -74.4,166.2 -166.2,166.2C235.4,863.7 161,789.3 161,697.5c0,-91.8 74.4,-166.2 166.2,-166.2l110.8,0 55.4,0 0,55.4L493.4,697.5 493.4,697.5 493.4,697.5zM585.7,697.5 L585.7,586.7 696.5,586.7c61.2,0 110.8,49.6 110.8,110.8 0,61.2 -49.6,110.8 -110.8,110.8C635.3,808.3 585.7,758.7 585.7,697.5L585.7,697.5 585.7,697.5zM530.3,697.5c0,91.8 74.4,166.2 166.2,166.2 91.8,0 166.2,-74.4 166.2,-166.2 0,-91.8 -74.4,-166.2 -166.2,-166.2L585.7,531.3l-55.4,0 0,55.4L530.3,697.5 530.3,697.5 530.3,697.5zM438,328.2l0,110.8L327.2,439c-61.2,0 -110.8,-49.6 -110.8,-110.8 0,-61.2 49.6,-110.8 110.8,-110.8C388.4,217.4 438,267 438,328.2L438,328.2 438,328.2zM493.4,328.2c0,-91.8 -74.4,-166.2 -166.2,-166.2C235.4,162 161,236.4 161,328.2c0,91.8 74.4,166.2 166.2,166.2l110.8,0 55.4,0 0,-55.4L493.4,328.2 493.4,328.2 493.4,328.2zM585.7,328.2l0,110.8L696.5,439c61.2,0 110.8,-49.6 110.8,-110.8 0,-61.2 -49.6,-110.8 -110.8,-110.8C635.3,217.4 585.7,267 585.7,328.2L585.7,328.2 585.7,328.2zM530.3,328.2 L530.3,328.2C530.3,236.4 604.7,162 696.5,162c91.8,0 166.2,74.4 166.2,166.2 0,91.8 -74.4,166.2 -166.2,166.2L585.7,494.4l-55.4,0 0,-55.4L530.3,328.2 530.3,328.2 530.3,328.2zM530.3,328.2"
+        android:fillColor="#272636"
-      android:fillColor="#272636"/>
+        android:pathData="M438,697.5 L438,697.5 438,586.7 327.2,586.7c-61.2,0 -110.8,49.6 -110.8,110.8 0,61.2 49.6,110.8 110.8,110.8C388.4,808.3 438,758.7 438,697.5L438,697.5 438,697.5 438,697.5zM493.4,697.5c0,91.8 -74.4,166.2 -166.2,166.2C235.4,863.7 161,789.3 161,697.5c0,-91.8 74.4,-166.2 166.2,-166.2l110.8,0 55.4,0 0,55.4L493.4,697.5 493.4,697.5 493.4,697.5zM585.7,697.5 L585.7,586.7 696.5,586.7c61.2,0 110.8,49.6 110.8,110.8 0,61.2 -49.6,110.8 -110.8,110.8C635.3,808.3 585.7,758.7 585.7,697.5L585.7,697.5 585.7,697.5zM530.3,697.5c0,91.8 74.4,166.2 166.2,166.2 91.8,0 166.2,-74.4 166.2,-166.2 0,-91.8 -74.4,-166.2 -166.2,-166.2L585.7,531.3l-55.4,0 0,55.4L530.3,697.5 530.3,697.5 530.3,697.5zM438,328.2l0,110.8L327.2,439c-61.2,0 -110.8,-49.6 -110.8,-110.8 0,-61.2 49.6,-110.8 110.8,-110.8C388.4,217.4 438,267 438,328.2L438,328.2 438,328.2zM493.4,328.2c0,-91.8 -74.4,-166.2 -166.2,-166.2C235.4,162 161,236.4 161,328.2c0,91.8 74.4,166.2 166.2,166.2l110.8,0 55.4,0 0,-55.4L493.4,328.2 493.4,328.2 493.4,328.2zM585.7,328.2l0,110.8L696.5,439c61.2,0 110.8,-49.6 110.8,-110.8 0,-61.2 -49.6,-110.8 -110.8,-110.8C635.3,217.4 585.7,267 585.7,328.2L585.7,328.2 585.7,328.2zM530.3,328.2 L530.3,328.2C530.3,236.4 604.7,162 696.5,162c91.8,0 166.2,74.4 166.2,166.2 0,91.8 -74.4,166.2 -166.2,166.2L585.7,494.4l-55.4,0 0,-55.4L530.3,328.2 530.3,328.2 530.3,328.2zM530.3,328.2" />
 </vector>

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

@@ -3,10 +3,10 @@
     android:height="128dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
+    <path
-      android:fillColor="#FF000000"
+        android:fillColor="#FF000000"
-      android:pathData="M800.1,145.9h-105v13.1c0,43.5 -35.2,78.7 -78.7,78.7h-209.9c-43.5,0 -78.7,-35.2 -78.7,-78.7v-13.1h-105c-43.5,0 -78.7,35.2 -78.7,78.7v629.8c0,43.5 35.2,78.7 78.7,78.7h577.3c43.5,0 78.7,-35.2 78.7,-78.7v-629.8c0,-43.5 -35.2,-78.7 -78.7,-78.7v0zM695.2,723.1h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2 0,-14.5 11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.8 26.2,26.2 0,14.5 -11.8,26.2 -26.2,26.2v0zM695.2,565.7h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2 0,-14.5 11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.7 26.2,26.2 0,14.5 -11.8,26.2 -26.2,26.2v0zM695.2,408.3h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2s11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.7 26.2,26.2s-11.8,26.2 -26.2,26.2v0zM695.2,408.3z"/>
+        android:pathData="M800.1,145.9h-105v13.1c0,43.5 -35.2,78.7 -78.7,78.7h-209.9c-43.5,0 -78.7,-35.2 -78.7,-78.7v-13.1h-105c-43.5,0 -78.7,35.2 -78.7,78.7v629.8c0,43.5 35.2,78.7 78.7,78.7h577.3c43.5,0 78.7,-35.2 78.7,-78.7v-629.8c0,-43.5 -35.2,-78.7 -78.7,-78.7v0zM695.2,723.1h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2 0,-14.5 11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.8 26.2,26.2 0,14.5 -11.8,26.2 -26.2,26.2v0zM695.2,565.7h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2 0,-14.5 11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.7 26.2,26.2 0,14.5 -11.8,26.2 -26.2,26.2v0zM695.2,408.3h-367.4c-14.5,0 -26.2,-11.7 -26.2,-26.2s11.7,-26.2 26.2,-26.2h367.4c14.5,0 26.2,11.7 26.2,26.2s-11.8,26.2 -26.2,26.2v0zM695.2,408.3z" />
-  <path
+    <path
-      android:fillColor="#FF000000"
+        android:fillColor="#FF000000"
-      android:pathData="M419.7,198.4h183.7c21.8,0 39.4,-17.6 39.4,-39.4v-26.2c0,-21.7 -17.6,-39.4 -39.4,-39.4h-183.7c-21.7,0 -39.4,17.6 -39.4,39.4v26.2c0,21.7 17.6,39.4 39.4,39.4v0zM419.7,198.4z"/>
+        android:pathData="M419.7,198.4h183.7c21.8,0 39.4,-17.6 39.4,-39.4v-26.2c0,-21.7 -17.6,-39.4 -39.4,-39.4h-183.7c-21.7,0 -39.4,17.6 -39.4,39.4v26.2c0,21.7 17.6,39.4 39.4,39.4v0zM419.7,198.4z" />
 </vector>

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

@@ -2,8 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
-    <corners
+    <corners android:radius="15dp" />
-        android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@android:color/white" />

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

@@ -19,9 +19,8 @@
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         app:ico_color="@color/red"
-        app:ico_icon="ion_ios_heart"
+        app:ico_icon="ion_ios_heart" />
-        />
+    <!--        app:srcCompat="@mipmap/ic_launcher_round"-->
-<!--        app:srcCompat="@mipmap/ic_launcher_round"-->
 
     <TextView
         android:layout_width="match_parent"

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

@@ -9,10 +9,9 @@
         android:id="@+id/grid_project_item_icon"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_marginTop="15dp"
         android:layout_centerHorizontal="true"
-        android:src="@mipmap/ic_launcher"
+        android:layout_marginTop="15dp"
-        />
+        android:src="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/grid_project_item_txt"
@@ -21,10 +20,9 @@
         android:layout_below="@id/grid_project_item_icon"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="10dp"
-        android:textAlignment="center"
         android:text="文字区域"
+        android:textAlignment="center"
         android:textColor="#000000"
-        android:textSize="20dp"
+        android:textSize="20dp" />
-        />
 
 </RelativeLayout>

app/src/main/res/navigation/mobile_navigation.xml

@@ -16,23 +16,21 @@
         android:name="cc.niushuai.dididone.ui.statistic.StatisticFragment"
         android:label="@string/n_menu_name_statistic"
         tools:layout="@layout/fragment_statistic" />
-<!--
+    <!--
-    <fragment
+        <fragment
-        android:id="@id/n_nav_setting"
+            android:id="@id/n_nav_setting"
-        android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
+            android:name="cc.niushuai.dididone.ui.setting.SettingFragment"
-        android:label="@string/n_menu_name_setting"
+            android:label="@string/n_menu_name_setting"
-        tools:layout="@layout/fragment_setting" />-->
+            tools:layout="@layout/fragment_setting" />-->
 
     <fragment
         android:id="@id/n_nav_project"
         android:name="cc.niushuai.dididone.ui.setting.project.ProjectFragment"
-        android:label="@string/n_menu_name_project"
+        android:label="@string/n_menu_name_project" />
-        />
 
     <fragment
         android:id="@id/n_nav_icon"
         android:name="cc.niushuai.dididone.ui.setting.icon.IconFragment"
-        android:label="@string/n_menu_name_icon"
+        android:label="@string/n_menu_name_icon" />
-        />
 
 </navigation>