fixed time issue

CoppellCoders · Apr 22, 2019 · 50bb672 · 50bb672
1 parent 2ed6680
commit 50bb672
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/NoTixBus/app/src/main/java/ml/coppellcoders/notixbus/EventAdapter.java b/NoTixBus/app/src/main/java/ml/coppellcoders/notixbus/EventAdapter.java
@@ -104,8 +104,9 @@ public void bind(int position) {
             date.setText(monthNames[mMonth] + " " + mDay);
             location.setText(Item.getVenue());
             long timeLeft = Item.getTime() - System.currentTimeMillis();
-            int minutes = (int) ((timeLeft / (1000*60)) % 60);
-            int hours   = (int) ((timeLeft / (1000*60*60)) % 24);
+            int minutes = (int) ((timeLeft / (1000 * 60)) % 60);
+            int hours = (int) ((timeLeft / (1000 * 60 * 60)));
+
             time.setText(hours+" hours " + minutes +" minutes");
         }
 

diff --git a/NoTixClient/app/src/main/java/ml/coppellcoders/notixclient/MyTixAdapter.java b/NoTixClient/app/src/main/java/ml/coppellcoders/notixclient/MyTixAdapter.java
@@ -6,6 +6,7 @@
 import android.graphics.BitmapFactory;
 import android.support.annotation.NonNull;
 import android.util.Base64;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,12 +89,12 @@ public void bind(int position) {
             monthNames[10] = "Nov";
             monthNames[11] = "Dec";
             final long millis = events.getTime() - System.currentTimeMillis();
-            int hours = (int) (TimeUnit.MILLISECONDS.toHours(millis) - TimeUnit.HOURS.toHours(TimeUnit.MILLISECONDS.toHours(millis)));
-            int mins = (int) (TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)));
+            int minutes = (int) ((millis / (1000 * 60)) % 60);
+            int hours = (int) ((millis / (1000 * 60 * 60)));
 
             date.setText(monthNames[mMonth] + " " + mDay);
 
-            price.setText(hours + " hours " + mins +" mins");
+            price.setText(hours + " hour(s) " + minutes +" min(s)");
 
         }
     }

diff --git a/NoTixClient/app/src/main/java/ml/coppellcoders/notixclient/MyTixClickedActivity.java b/NoTixClient/app/src/main/java/ml/coppellcoders/notixclient/MyTixClickedActivity.java
@@ -101,9 +101,11 @@ public void onClick(View view) {
 
         final long millis = event.getTime() - System.currentTimeMillis();
 
-        int hours = (int) (TimeUnit.MILLISECONDS.toHours(millis) - TimeUnit.HOURS.toHours(TimeUnit.MILLISECONDS.toHours(millis)));
-        int mins = (int) (TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)));
-        date.setText(hours + " hours " + mins +" mins");
+
+        int minutes = (int) ((millis / (1000 * 60)) % 60);
+        int hours = (int) ((millis / (1000 * 60 * 60)));
+
+        date.setText(hours + " hour(s) " + minutes +" min(s)");
 
         int mMonth = calendar.get(Calendar.MONTH);
         int mDay = calendar.get(Calendar.DAY_OF_MONTH);