1 days left ==> 1 day left, -5 days left ==> 5 days ago

v4lpt · Sep 7, 2024 · b9adbea · b9adbea
1 parent 7902062
commit b9adbea
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/app/src/main/java/v4lpt/vpt/f036/esw/EventAdapter.java b/app/src/main/java/v4lpt/vpt/f036/esw/EventAdapter.java
@@ -65,8 +65,15 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
 
             eventHolder.titleTextView.setText(event.getTitle());
             long daysLeft = event.getDaysLeft();
-            eventHolder.daysLeftTextView.setText(daysLeft + " days left");
-
+            String daysText;
+            if (daysLeft < 0) {
+                daysText = Math.abs(daysLeft) + (Math.abs(daysLeft) == 1 ? " day ago" : " days ago");
+            } else if (daysLeft == 0) {
+                daysText = "Today";
+            } else {
+                daysText = daysLeft + (daysLeft == 1 ? " day left" : " days left");
+            }
+            eventHolder.daysLeftTextView.setText(daysText);
             String formattedDate = event.getDate().format(dateFormatter);
             eventHolder.dateTextView.setText(formattedDate);
 

diff --git a/app/src/main/java/v4lpt/vpt/f036/esw/PreviewEventAdapter.java b/app/src/main/java/v4lpt/vpt/f036/esw/PreviewEventAdapter.java
@@ -48,8 +48,15 @@ public void onBindViewHolder(@NonNull EventViewHolder holder, int position) {
         if (previewEvent != null) {
             holder.titleTextView.setText(previewEvent.getTitle());
             long daysLeft = previewEvent.getDaysLeft();
-            holder.daysLeftTextView.setText(daysLeft + " days left");
-
+            String daysText;
+            if (daysLeft < 0) {
+                daysText = Math.abs(daysLeft) + (Math.abs(daysLeft) == 1 ? " day ago" : " days ago");
+            } else if (daysLeft == 0) {
+                daysText = "Today";
+            } else {
+                daysText = daysLeft + (daysLeft == 1 ? " day left" : " days left");
+            }
+            holder.daysLeftTextView.setText(daysText);
             String formattedDate = previewEvent.getDate().format(dateFormatter);
             holder.dateTextView.setText(formattedDate);