added jodaTime Util and time Patterns

AndroidLib · Dec 14, 2015 · 1475bfa · 1475bfa
1 parent 4b55c18
commit 1475bfa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/app/src/main/java/com/greenlionsoft/pollution/madrid/tools/JodaUtil.java b/app/src/main/java/com/greenlionsoft/pollution/madrid/tools/JodaUtil.java
@@ -13,24 +13,24 @@ private JodaUtil() {
     }
 
 
-    public static DateTime JodaStringToDateTime(String stringDate) {
+    public static DateTime JodaStringToDateTime(String stringDate, String pattern) {
 
-        DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+        DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
         DateTime dateTime = fmt.parseDateTime(stringDate);
 
         return dateTime;
     }
 
-    public static String JodaDateTimeToString(DateTime dateTime) {
-        DateTimeFormatter fmt = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
+    public static String JodaDateTimeToString(DateTime dateTime, String pattern) {
+        DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
         String dateString = fmt.print(dateTime);
 
         return dateString;
     }
 
-    public static String getNowString() {
+    public static String getNowString(String pattern) {
 
-        return JodaDateTimeToString(new DateTime());
+        return JodaDateTimeToString(new DateTime(), pattern);
 
     }
 }
diff --git a/...rc/main/java/com/greenlionsoft/pollution/madrid/ui/activities/PollutionAlertActivity.java b/...rc/main/java/com/greenlionsoft/pollution/madrid/ui/activities/PollutionAlertActivity.java
@@ -20,6 +20,7 @@
 import butterknife.Bind;
 import butterknife.ButterKnife;
 import dependencies.IAppInjector;
+import entities.TimePatterns;
 import pollutionalert.IPollutionAlertView;
 import pollutionalert.PollutionAlertPresenter;
 
@@ -148,8 +149,8 @@ public void showScenario4Alert() {
     @Override
     public void showScenarioTitle(int scenarioLevel, String yyyyMMdd_HHmm) {
 
-        DateTime alertTime = JodaUtil.JodaStringToDateTime(yyyyMMdd_HHmm, JodaUtil.ALERT_PATTERN);
-        String displayTime = JodaUtil.JodaDateTimeToString(alertTime, JodaUtil.DISPLAY_PATTERN);
+        DateTime alertTime = JodaUtil.JodaStringToDateTime(yyyyMMdd_HHmm, TimePatterns.ALERT_PATTERN);
+        String displayTime = JodaUtil.JodaDateTimeToString(alertTime, TimePatterns.DISPLAY_PATTERN);
 
         mScenarioTitleTv.setText(String.format(getResources().getString(R.string.activated_scenario_protocol), scenarioLevel, displayTime));
     }

diff --git a/domain/src/main/java/entities/TimePatterns.java b/domain/src/main/java/entities/TimePatterns.java
@@ -0,0 +1,12 @@
+package entities;
+
+public class TimePatterns {
+
+    public static final String ALERT_PATTERN = "yyyyMMdd_HHmm";
+    public static final String SERVER_PATTERN = "yyyy-MM-dd HH:mm:ss";
+    public static final String DISPLAY_PATTERN = "dd/MM/yyyy";
+
+    private TimePatterns() {
+
+    }
+}
diff --git a/presentation/src/main/java/pollutionalert/PollutionAlertPresenter.java b/presentation/src/main/java/pollutionalert/PollutionAlertPresenter.java
@@ -3,6 +3,8 @@
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 
+import entities.TimePatterns;
+
 public class PollutionAlertPresenter {
 
     private IPollutionAlertView mView;
@@ -44,7 +46,7 @@ private void displayAlertContent() {
         String dateString = mPollutionAlertUseCase.getPollutionAlertDate();
 
         DateTime today = new DateTime();
-        DateTime alertDate = DateTimeFormat.forPattern("yyyyMMdd_HHmm").parseDateTime(dateString);
+        DateTime alertDate = DateTimeFormat.forPattern(TimePatterns.ALERT_PATTERN).parseDateTime(dateString);
 
         if (scenarioLevel == 0 || isAlertExpired(today, alertDate)) {
             mView.showNoScenarioTitle();