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
-        android:radius="15dp" />
+    <corners android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@android:color/white" />

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

@@ -4,6 +4,6 @@
     android:viewportWidth="1024"
     android:viewportHeight="1024">
     <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/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
-        android:radius="15dp" />
+    <corners android:radius="15dp" />
     <stroke
         android:width="1dp"
         android:color="@android:color/white" />

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

@@ -19,8 +19,7 @@
         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"-->
 
     <TextView

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

@@ -26,13 +26,11 @@
     <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>