From c76f5045254411550db5d1a26800a2b1cc379ceb Mon Sep 17 00:00:00 2001
From: hlq07 <lqhuang16@fudan.edu.cn>
Date: Mon, 28 May 2018 03:45:21 +0800
Subject: [PATCH] improve code style

---
 .../org/cutem/cutecalendar/model/TodoItem.java  | 17 +++++++++--------
 .../presenter/ListTodoItemsStrategy.java        | 17 ++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/org/cutem/cutecalendar/model/TodoItem.java b/app/src/main/java/org/cutem/cutecalendar/model/TodoItem.java
index d776f67..d034954 100644
--- a/app/src/main/java/org/cutem/cutecalendar/model/TodoItem.java
+++ b/app/src/main/java/org/cutem/cutecalendar/model/TodoItem.java
@@ -59,14 +59,6 @@ public class TodoItem {
             "interview"
     };
 
-    public static String typeName(int type) {
-        if (1 <= type && type < TYPE_NAME.length) {
-            return TYPE_NAME[type];
-        } else {
-            return TYPE_NAME[0];
-        }
-    }
-
     // endregion type constants
 
 
@@ -341,4 +333,13 @@ public class TodoItem {
         return ((Object) mId).hashCode();
     }
 
+
+    public static String typeName(int type) {
+        if (1 <= type && type < TYPE_NAME.length) {
+            return TYPE_NAME[type];
+        } else {
+            return TYPE_NAME[0];
+        }
+    }
+
 }
diff --git a/app/src/main/java/org/cutem/cutecalendar/presenter/ListTodoItemsStrategy.java b/app/src/main/java/org/cutem/cutecalendar/presenter/ListTodoItemsStrategy.java
index d0ea2fb..a5a08a8 100644
--- a/app/src/main/java/org/cutem/cutecalendar/presenter/ListTodoItemsStrategy.java
+++ b/app/src/main/java/org/cutem/cutecalendar/presenter/ListTodoItemsStrategy.java
@@ -45,17 +45,16 @@ public class ListTodoItemsStrategy {
     }
 
     private void onClickSearch() {
-        try {
-            Calendar c1 = CalendarUtil.constructCalendar(
-                    fromDate.getText(), fromTime.getText()
-            );
-            Calendar c2 = CalendarUtil.constructCalendar(
-                    toDate.getText(), toTime.getText()
-            );
+        String fromString = fromDate + "/" + fromTime;
+        String toString = toDate + "/" + toTime;
 
-            mPresenter.listTodoItemDuring(c1, c2);
-        } catch (IllegalArgumentException e) {
+        if (!CalendarUtil.isValidCalendarString(fromString) ||
+                !CalendarUtil.isValidCalendarString(toString)) {
             mPresenter.showAlert(0, "滚");
+        } else {
+            Calendar c1 = CalendarUtil.constructCalendar(fromString);
+            Calendar c2 = CalendarUtil.constructCalendar(toString);
+            mPresenter.listTodoItemDuring(c1, c2);
         }
     }