Merge pull request #1151 from StoDevX/hawkrives-patch-2

clean up calendar times

Author: hawkrives

source/views/calendar/event-row.js

@@ -41,6 +41,10 @@ export default function EventRow({
 }) {
   const title = fastGetTrimmedText(event.summary)
 
+  const location = event.location && event.location.trim().length
+    ? <Detail style={styles.detail}>{event.location}</Detail>
+    : null
+
   return (
     <ListRow
       contentContainerStyle={styles.row}
@@ -53,9 +57,14 @@ export default function EventRow({
 
         <Bar style={styles.bar} />
 
-        <Column flex={1} paddingTop={2} paddingBottom={3}>
+        <Column
+          flex={1}
+          paddingTop={2}
+          paddingBottom={3}
+          justifyContent="space-between"
+        >
           <Title style={styles.title}>{title}</Title>
-          <Detail style={styles.detail}>{event.location}</Detail>
+          {location}
         </Column>
       </Row>
     </ListRow>
@@ -79,21 +88,33 @@ function CalendarTimes({event, style}: {event: EventType, style: any}) {
     )
   }
 
+  let startTimeFormatted = event.startTime.format('h:mm A')
+  let endTimeFormatted = event.endTime.format('h:mm A')
+  let midnightTime = '12:00 AM'
+
   let start, end
   if (event.isOngoing) {
     start = event.startTime.format('MMM. D')
     end = event.endTime.format('MMM. D')
   } else if (multiDay) {
-    start = event.startTime.format('h:mm A')
-    end = `to ${event.endTime.format('MMM. D h:mm A')}`
+    // 12:00 PM to Jun. 25 3:00pm
+    // Midnight to Jun. 25 <-- assuming the end time is also midnight
+    start = startTimeFormatted
+    const endFormat = endTimeFormatted === midnightTime
+      ? 'MMM. D'
+      : 'MMM. D h:mm A'
+    end = `to ${event.endTime.format(endFormat)}`
   } else if (sillyZeroLength) {
-    start = event.startTime.format('h:mm A')
+    start = startTimeFormatted
     end = 'until ???'
   } else {
-    start = event.startTime.format('h:mm A')
-    end = event.endTime.format('h:mm A')
+    start = startTimeFormatted
+    end = endTimeFormatted
   }
 
+  start = start === midnightTime ? 'Midnight' : start
+  end = end === midnightTime ? 'Midnight' : end
+
   return (
     <Column style={style}>
       <Text style={[styles.time, styles.start]}>{start}</Text>