fix: 🔘 界面调整

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

@@ -26,7 +26,6 @@ import cc.niushuai.dididone.biz.roomx.DBManager;
 import cc.niushuai.dididone.biz.vo.ProjectIcon;
 import cc.niushuai.dididone.databinding.FragmentProjectBinding;
 import cc.niushuai.dididone.ui.base.InitAndSetListener;
-import cc.niushuai.dididone.util.Snowflake;
 import cc.niushuai.dididone.util.Toasts;
 import cc.niushuai.dididone.util.XLog;
 import cn.hutool.core.util.StrUtil;
@@ -60,11 +59,11 @@ public class ProjectFragment extends Fragment implements InitAndSetListener {
     @Override
     public void init() {
 
-        initProjectGrid();
+        initProjectGrid(getDataList());
     }
 
-    private void initProjectGrid() {
+    private void initProjectGrid(List<ProjectIcon> dataList) {
-        gridViewAdapter4Project = new GridViewAdapter4Project(getContext(), getDataList());
+        gridViewAdapter4Project = new GridViewAdapter4Project(getContext(), dataList);
         binding.gridProject.setAdapter(gridViewAdapter4Project);
     }
 
@@ -79,11 +78,12 @@ public class ProjectFragment extends Fragment implements InitAndSetListener {
 
                     list.clear();
                     list.addAll(ProjectIcon.trans(projectList));
+                    // 最后一个要添加 + 符号
                     list.add(defaultAddProject());
+
+                    initProjectGrid(list);
                 });
 
-        // 最后一个要添加 + 符号
-        list.add(defaultAddProject());
         return list;
     }
 

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

@@ -11,14 +11,14 @@
         android:id="@+id/np_project_name"
         android:layout_width="0dp"
         android:layout_height="50dp"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="20dp"
 
         android:gravity="center|right"
         android:text="@string/np_project_name"
         android:textSize="24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintWidth_percent="0.3" />
+        app:layout_constraintWidth_percent="0.2" />
 
     <EditText
         android:id="@+id/np_project_name_txt"
@@ -42,7 +42,7 @@
         android:textSize="24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/np_project_name"
-        app:layout_constraintWidth_percent="0.3" />
+        app:layout_constraintWidth_percent="0.2" />
 
     <ImageView
         android:id="@+id/np_icon_fill"
@@ -65,7 +65,7 @@
         android:textSize="24dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/np_icon_name"
-        app:layout_constraintWidth_percent="0.3" />
+        app:layout_constraintWidth_percent="0.2" />
 
     <Button
         android:id="@+id/np_color_picker"

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

@@ -23,7 +23,7 @@
     <string name="n_menu_name_icon">ICON</string>
     <string name="icon_name_FontAwesome">FontAwesome</string>
     <string name="n_menu_name_project">打卡项</string>
-    <string name="np_project_name">项目名称</string>
+    <string name="np_project_name">项目</string>
     <string name="np_icon_name">图标</string>
     <string name="np_color_name">颜色</string>
     <string name="np_color_picker">点我选颜色</string>