plusonelabs#236 Don't show time for All day events.

plusonelabs#221 Display location independently of time, including showing location for All day events.
andstatus · Sep 4, 2019 · 56e54e6 · 56e54e6
1 parent f871437
commit 56e54e6
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/app/src/main/java/org/andstatus/todoagenda/widget/CalendarEntry.java b/app/src/main/java/org/andstatus/todoagenda/widget/CalendarEntry.java
@@ -91,17 +91,21 @@ public CalendarEvent getEvent() {
     }
 
     public String getEventTimeString() {
-        return hideEventDetails() ? "" : createTimeSpanString(getContext());
+        return hideEventTime() ? "" : createTimeSpanString(getContext());
+    }
+
+    private boolean hideEventTime() {
+        return spansOneFullDay() && !(isStartOfMultiDayEvent() || isEndOfMultiDayEvent()) ||
+                isAllDay();
     }
 
     String getLocationString() {
-        return getLocation() == null || getLocation().isEmpty() || hideEventDetails() ||
-                !getSettings().getShowLocation() ? "" : SPACE_PIPE_SPACE + getLocation();
+        return hideLocation() ? "" : SPACE_PIPE_SPACE + getLocation();
     }
 
-    private boolean hideEventDetails() {
-        return spansOneFullDay() && !(isStartOfMultiDayEvent() || isEndOfMultiDayEvent()) ||
-                isAllDay() && getSettings().getFillAllDayEvents();
+    private boolean hideLocation() {
+        return getLocation() == null || getLocation().isEmpty() ||
+                !getSettings().getShowLocation();
     }
 
     private String createTimeSpanString(Context context) {