refactor: 🗼 代码格式化

app/src/main/java/cc/niushuai/dididone/biz/roomx/Database.java

@@ -5,8 +5,8 @@ import androidx.room.RoomDatabase;
 import cc.niushuai.dididone.biz.dao.ProjectDao;
 import cc.niushuai.dididone.biz.dao.RecordDao;
 import cc.niushuai.dididone.biz.dao.SavedIconDao;
-import cc.niushuai.dididone.biz.entity.Record;
 import cc.niushuai.dididone.biz.entity.Project;
+import cc.niushuai.dididone.biz.entity.Record;
 import cc.niushuai.dididone.biz.entity.SavedIcon;
 
 

app/src/main/java/cc/niushuai/dididone/biz/vo/ProjectIcon.java

@@ -20,6 +20,15 @@ public class ProjectIcon {
         this.color = color;
     }
 
+    public static List<ProjectIcon> trans(List<Project> projectList) {
+
+        ArrayList<ProjectIcon> list = new ArrayList<>(projectList.size());
+        for (Project project : projectList) {
+            list.add(new ProjectIcon(project.getId(), project.getName(), project.getIcon(), project.getIconColor()));
+        }
+        return list;
+    }
+
     public Long getId() {
         return id;
     }
@@ -51,14 +60,4 @@ public class ProjectIcon {
     public void setColor(Integer color) {
         this.color = color;
     }
-
-
-    public static List<ProjectIcon> trans(List<Project> projectList) {
-
-        ArrayList<ProjectIcon> list = new ArrayList<>(projectList.size());
-        for (Project project : projectList) {
-            list.add(new ProjectIcon(project.getId(), project.getName(), project.getIcon(), project.getIconColor()));
-        }
-        return list;
-    }
 }

app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java

@@ -1,10 +1,6 @@
 package cc.niushuai.dididone.ui.calendar;
 
-import android.app.Instrumentation;
 import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.RectF;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Gravity;
@@ -28,15 +24,12 @@ import com.necer.calendar.BaseCalendar;
 import com.necer.entity.Lunar;
 import com.necer.enumeration.DateChangeBehavior;
 import com.necer.listener.OnCalendarChangedListener;
-import com.necer.painter.CalendarPainter;
 import com.necer.painter.InnerPainter;
 import com.necer.utils.CalendarUtil;
 
 import org.joda.time.LocalDate;
 import org.reactivestreams.Subscription;
 
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
 import java.util.List;
 import java.util.stream.Collectors;
 

app/src/main/java/cc/niushuai/dididone/ui/setting/project/GridViewAdapter4Project.java

@@ -17,8 +17,9 @@ import cc.niushuai.dididone.biz.vo.ProjectIcon;
 
 public class GridViewAdapter4Project extends BaseAdapter {
 
-    private Context context;
     protected List<ProjectIcon> projectIconList;
+    private Context context;
+
     public GridViewAdapter4Project(Context context, List<ProjectIcon> projectIconList) {
         this.context = context;
         this.projectIconList = projectIconList;

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

@@ -30,35 +30,22 @@ import java.util.stream.Collectors;
  */
 public class IntSnowflake {
     private static final IntSnowflake snowflake = new IntSnowflake(0L);
-
-    public static int next_id() {
-        return (int) 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 = 8;
-
     /**
      * The number of bits occupied by timestamp
      */
     private final int timestampBits = 12;
-
     /**
      * The number of bits occupied by sequence
      */
     private final int sequenceBits = 12;
-
     /**
      * Maximum supported machine id, the result is 1023
      */
@@ -82,7 +69,6 @@ public class IntSnowflake {
      * lowest  12 bit: sequence
      */
     private AtomicLong timestampAndSequence;
-
     /**
      * instantiate an IdWorker using given workerId
      *
@@ -93,6 +79,26 @@ public class IntSnowflake {
         initWorkerId(workerId);
     }
 
+    public static int next_id() {
+        return (int) snowflake.nextId();
+    }
+
+    public static String next_id_str() {
+        return snowflake.nextId() + "";
+    }
+
+    public static void main(String[] args) {
+
+        Map<Integer, Integer> map = new HashMap<>();
+        for (int i = 0; i < 100000000; i++) {
+            long id = next_id();
+            map.put((int) id, (map.getOrDefault(id, 0) + 1));
+        }
+        List<Integer> collect = map.values().stream().filter(item -> item > 0).collect(Collectors.toList());
+        System.out.println(map.size());
+        System.out.println(collect);
+    }
+
     /**
      * init first timestamp and sequence immediately
      */
@@ -200,17 +206,4 @@ public class IntSnowflake {
     private long generateRandomWorkerId() {
         return new Random().nextInt(maxWorkerId + 1);
     }
-
-
-    public static void main(String[] args) {
-
-        Map<Integer, Integer> map = new HashMap<>();
-        for (int i = 0; i < 100000000; i++) {
-            long id = next_id();
-            map.put((int) id, (map.getOrDefault(id, 0) + 1));
-        }
-        List<Integer> collect = map.values().stream().filter(item -> item > 0).collect(Collectors.toList());
-        System.out.println(map.size());
-        System.out.println(collect);
-    }
 }

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

@@ -3,7 +3,7 @@
     android:height="128dp"
     android:viewportWidth="1024"
     android:viewportHeight="1024">
-  <path
+    <path
-      android:pathData="M960,1024H128a128,128 0,0 1,-128 -128V64a64,64 0,0 1,128 0v832h832a64,64 0,1 1,0 128zM768,64h192v768h-192V64zM512,320h192v512H512V320zM256,576h192v256H256V576z"
+        android:fillColor="#000000"
-      android:fillColor="#000000"/>
+        android:pathData="M960,1024H128a128,128 0,0 1,-128 -128V64a64,64 0,0 1,128 0v832h832a64,64 0,1 1,0 128zM768,64h192v768h-192V64zM512,320h192v512H512V320zM256,576h192v256H256V576z" />
 </vector>

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

@@ -2,8 +2,8 @@
     android:shape="rectangle">
     <gradient
         android:angle="135"
-        android:endColor="#86E35ED5"
         android:centerColor="#B2CA9E2F"
+        android:endColor="#86E35ED5"
         android:startColor="#5E8BF8A3"
         android:type="linear" />
 </shape>

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

@@ -102,5 +102,4 @@
         app:layout_constraintWidth_percent="0.35" />
 
 
-
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -57,28 +57,28 @@
         android:layout_marginRight="30dp"
         android:layout_marginBottom="30dp"
         android:elevation="10dp"
-        android:translationZ="10dp"
         android:padding="10dp"
+        android:translationZ="10dp"
         app:ico_color="@color/black"
         app:ico_icon="cmd_checkbox_marked_circle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-<!--
+    <!--
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
+            android:id="@+id/floatingActionButton"
-        android:layout_width="50dp"
+            android:layout_width="50dp"
-        android:layout_height="50dp"
+            android:layout_height="50dp"
-        android:layout_marginRight="30dp"
+            android:layout_marginRight="30dp"
-        android:layout_marginBottom="30dp"
+            android:layout_marginBottom="30dp"
-        android:background="#00000000"
+            android:background="#00000000"
-        android:clickable="true"
+            android:clickable="true"
-        android:padding="10dp"
+            android:padding="10dp"
-        android:src="@android:drawable/ic_input_add"
+            android:src="@android:drawable/ic_input_add"
-        app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent" />
--->
+    -->
 
 
     <!--

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#4DD5D1D1"
@@ -13,13 +13,12 @@
         android:id="@+id/grid_project"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:horizontalSpacing="10dp"
-        app:layout_constraintTop_toTopOf="parent"
         android:numColumns="3"
         android:padding="5dp"
-        android:horizontalSpacing="10dp"
         android:verticalSpacing="10dp"
-        ></GridView>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"></GridView>
 
 
 </LinearLayout>

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

@@ -10,8 +10,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:orientation="vertical">
-        >
 
         <TextView
             android:layout_width="match_parent"
@@ -27,12 +26,11 @@
             android:id="@+id/s_set_app_icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/s_set_linear_layout_height"
-            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
+            android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
+            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
             android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
-            android:layout_gravity="center_vertical"
+            android:background="@drawable/round_text_view_15dp">
-            android:background="@drawable/round_text_view_15dp"
-            >
 
             <ImageView
                 android:layout_width="@dimen/s_set_linear_image_view_size"
@@ -41,6 +39,7 @@
                 android:layout_marginTop="@dimen/s_set_linear_image_view_marginTop"
                 app:ico_color="@color/gray"
                 app:ico_icon="faw_laugh" />
+
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -54,11 +53,10 @@
             android:id="@+id/s_set_app_project"
             android:layout_width="match_parent"
             android:layout_height="@dimen/s_set_linear_layout_height"
-            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
             android:layout_marginLeft="@dimen/s_set_linear_layout_marginLeft"
+            android:layout_marginTop="@dimen/s_set_linear_layout_marginTop"
             android:layout_marginRight="@dimen/s_set_linear_layout_marginRight"
-            android:background="@drawable/round_text_view_15dp"
+            android:background="@drawable/round_text_view_15dp">
-            >
 
             <ImageView
                 android:layout_width="@dimen/s_set_linear_image_view_size"

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

@@ -15,9 +15,9 @@
         android:id="@+id/icons_grid_txt"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/icons_grid_item"
         android:layout_centerVertical="true"
         android:layout_marginLeft="20dp"
+        android:layout_toRightOf="@id/icons_grid_item"
         android:textSize="14dp" />
 
 </RelativeLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ppv_item_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -10,8 +9,7 @@
         android:id="@+id/ppv_item_icon"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_centerVertical="true"
+        android:layout_centerVertical="true" />
-        />
 
     <TextView
         android:id="@+id/ppv_item_txt"
@@ -19,15 +17,14 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginLeft="20dp"
-        android:textSize="18dp"
+        android:textSize="18dp" />
-        />
 
     <TextView
         android:id="@+id/ppv_item_desc"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:gravity="right"
         android:layout_marginRight="20dp"
-        android:textSize="12dp"/>
+        android:gravity="right"
+        android:textSize="12dp" />
 </LinearLayout>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--导航菜单 id-->
-    <item name="n_nav_calendar" type="id"/>
+    <item name="n_nav_calendar" type="id" />
-    <item name="n_nav_statistic" type="id"/>
+    <item name="n_nav_statistic" type="id" />
-    <item name="n_nav_setting" type="id"/>
+    <item name="n_nav_setting" type="id" />
     <!--日历页 id  数据集合-->
     <item name="c_calendar_check_in_list" type="id" />
     <item name="s_set_target_list" type="id" />