fix

am-Leon · Jul 12, 2020 · 2f5f6fe · 2f5f6fe
1 parent 2db732b
commit 2f5f6fe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 23 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/abduelrahman/dateutils/MainActivity.java b/app/src/main/java/com/abduelrahman/dateutils/MainActivity.java
@@ -1,16 +1,21 @@
 package com.abduelrahman.dateutils;
 
 import android.os.Bundle;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import am.dateutils.DateUtils;
+
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
+        Toast.makeText(this, new DateUtils(this, "2020-07-12T17:00:49Z").setSpecificFormat("MMMM dd, yyyy"), Toast.LENGTH_LONG).show();
+
     }
 
 }
diff --git a/dateUtils/src/main/java/am/dateutils/DateUtils.java b/dateUtils/src/main/java/am/dateutils/DateUtils.java
@@ -17,7 +17,7 @@ public class DateUtils {
     private Locale appLocale;
     private Calendar calendar;
     private String txtDate, txtTimeZone;
-    private DateFormat formatBackend, defaultDateFormat;
+    private DateFormat formatBackend, fullBackendFormat, defaultDateFormat;
 
 
     //------------------------- Class Constructor ------------------------------
@@ -62,6 +62,7 @@ private void init(String appLocale) {
         else
             this.appLocale = Locale.US;
 
+        fullBackendFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", this.appLocale);
         formatBackend = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss", this.appLocale);
         defaultDateFormat = new SimpleDateFormat("MMM dd yyyy", this.appLocale);
 
@@ -115,9 +116,13 @@ private Date getDateFormat(String txtDate, String timeZone) {
             date = formatBackend.parse(txtDate);
         } catch (ParseException e) {
             try {
-                date = defaultDateFormat.parse(txtDate);
+                date = fullBackendFormat.parse(txtDate);
             } catch (ParseException e1) {
-                e1.printStackTrace();
+                try {
+                    date = defaultDateFormat.parse(txtDate);
+                } catch (ParseException ex) {
+                    ex.printStackTrace();
+                }
             }
         }
         return date;
@@ -169,34 +174,22 @@ public int compareTwoDates(String firstDate, String firstDateTimeZone, String la
 
 
     public boolean getComparedDate(String StartDate, String EndDate) {
-        boolean result = false;
         Calendar c = Calendar.getInstance(Locale.ENGLISH);
-        try {
-            Date currentDate = formatBackend.parse(formatBackend.format(c.getTime()));
-            Date startDate = formatBackend.parse(StartDate);
-            Date endDate = formatBackend.parse(EndDate);
+        Date currentDate = getDateFormat(formatBackend.format(c.getTime()), null);
+        Date startDate = getDateFormat(StartDate, null);
+        Date endDate = getDateFormat(EndDate, null);
 
-            result = currentDate.after(startDate) && currentDate.before(endDate);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return result;
+        return currentDate.after(startDate) && currentDate.before(endDate);
     }
 
 
     public boolean getComparedDate(am.dateutils.Date startDate, am.dateutils.Date endDate) {
-        boolean result = false;
         Calendar c = Calendar.getInstance(Locale.ENGLISH);
-        try {
-            Date currentDate = formatBackend.parse(formatBackend.format(c.getTime()));
-            Date start = getDateFormat(startDate.getDate(), startDate.getTimezone());
-            Date end = getDateFormat(endDate.getDate(), endDate.getTimezone());
+        Date currentDate = getDateFormat(formatBackend.format(c.getTime()), null);
+        Date start = getDateFormat(startDate.getDate(), startDate.getTimezone());
+        Date end = getDateFormat(endDate.getDate(), endDate.getTimezone());
 
-            result = currentDate.after(start) && currentDate.before(end);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return result;
+        return currentDate.after(start) && currentDate.before(end);
     }