diff --git a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java index 2320fff..3527e33 100644 --- a/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java +++ b/app/src/main/java/cc/niushuai/dididone/biz/BizGlobal.java @@ -43,6 +43,8 @@ public class BizGlobal { public static final String PROJECT_ICON_COLOR = "projectIconColor"; public static final Map CACHE_PROJECT = new HashMap<>(); public static final Map CACHE_PROJECT_COUNT = new HashMap<>(); + public static final String EMPTY_PROJECT_TIPS = "先去添加打卡项吧~"; + public static final String EMPTY_PROJECT_TIPS_ICON = "cmd_alert_decagram_outline"; public static int REQUEST_CODE_GENERAL = 1; private BizGlobal() { diff --git a/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java index 2e5ebce..264257c 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/calendar/CalendarFragment.java @@ -292,6 +292,11 @@ public class CalendarFragment extends BaseFragment { } private void add2Top(Project project) { + // 过滤掉empty选项 + if (BizGlobal.EMPTY_PROJECT_TIPS.equals(project.getName())) { + return; + } + Record record = new Record(); record.setProjectId(project.getId()); record.setName(project.getName()); diff --git a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java index 3a5000c..cdf7846 100644 --- a/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java +++ b/app/src/main/java/cc/niushuai/dididone/ui/component/ProjectPopupView.java @@ -62,8 +62,8 @@ public class ProjectPopupView extends BottomPopupView { if (data.isEmpty()) { Project e = new Project(); - e.setName("先去添加打卡项吧~"); - e.setIcon("cmd_alert_decagram_outline"); + e.setName(BizGlobal.EMPTY_PROJECT_TIPS); + e.setIcon(BizGlobal.EMPTY_PROJECT_TIPS_ICON); e.setIconColor(Color.RED); data.add(e); projectCount = 0;