122 next day events on agenda

app/src/main/java/de/synyx/android/meeroo/business/event/EventRepository.java

@@ -7,13 +7,25 @@
 
 
 /**
- * @author  Max Dobler - [email protected]
+ * @author Max Dobler - [email protected]
  */
 public interface EventRepository {
 
+    /**
+     * Load today's events for room.
+     */
     Observable<EventModel> loadAllEventsForRoom(long roomId);
 
 
+    /**
+     * Load events for room.
+     *
+     * @param roomId room id
+     * @param days   amount of days to query events. Pass 1 for today, to for today and tomorrow, etc.
+     */
+    Observable<EventModel> loadAllEventsForRoom(long roomId, int days);
+
+
     Maybe<Long> insertEvent(long calendarId, String title, DateTime start, DateTime end);
 
 

app/src/main/java/de/synyx/android/meeroo/data/EventAdapter.java

@@ -13,7 +13,7 @@
  */
 public interface EventAdapter {
 
-    Observable<EventModel> getEventsForRoom(long roomId);
+    Observable<EventModel> getEventsForRoom(long roomId, int days);
 
 
     Maybe<Long> insertEvent(long calendarId, DateTime start, DateTime end, String title);

app/src/main/java/de/synyx/android/meeroo/data/EventAdapterImpl.java

@@ -44,7 +44,7 @@ public EventAdapterImpl(ContentResolver contentResolver) {
     }
 
     @Override
-    public Observable<EventModel> getEventsForRoom(long roomId) {
+    public Observable<EventModel> getEventsForRoom(long roomId, int days) {
 
         String[] projection = {
                 Instances.EVENT_ID, //
@@ -58,7 +58,7 @@ public Observable<EventModel> getEventsForRoom(long roomId) {
         String selection = Instances.CALENDAR_ID + " = " + roomId;
         String sortChronological = Instances.BEGIN + " ASC";
 
-        Cursor result = contentResolver.query(constructContentUri(), projection, selection, null, sortChronological);
+        Cursor result = contentResolver.query(constructContentUri(days), projection, selection, null, sortChronological);
 
         return Observable.fromIterable(fromCursor(result)) //
                 .doAfterNext(closeCursorIfLast()) //
@@ -138,11 +138,15 @@ private String getNewDuration(DateTime start, DateTime end) {
     }
 
 
-    private Uri constructContentUri() {
+    private Uri constructContentUri(int days) {
 
         Uri.Builder builder = Instances.CONTENT_URI.buildUpon();
         long now = new Date().getTime();
-        long endOfDay = LocalDateTime.now().withTime(23, 59, 59, 999).toDate().getTime();
+        long endOfDay = LocalDateTime
+                .now()
+                .plusDays(days - 1)
+                .withTime(23, 59, 59, 999)
+                .toDate().getTime();
         ContentUris.appendId(builder, now);
         ContentUris.appendId(builder, endOfDay);
 

app/src/main/java/de/synyx/android/meeroo/data/EventRepositoryImpl.java

@@ -2,21 +2,19 @@
 
 import androidx.annotation.NonNull;
 
+import org.joda.time.DateTime;
+
+import java.util.concurrent.ConcurrentHashMap;
+
 import de.synyx.android.meeroo.business.event.EventModel;
 import de.synyx.android.meeroo.business.event.EventRepository;
-
 import io.reactivex.Maybe;
 import io.reactivex.Observable;
-
 import io.reactivex.functions.Function;
 
-import org.joda.time.DateTime;
-
-import java.util.concurrent.ConcurrentHashMap;
-
 
 /**
- * @author  Max Dobler - [email protected]
+ * @author Max Dobler - [email protected]
  */
 public class EventRepositoryImpl implements EventRepository {
 
@@ -35,12 +33,18 @@ public EventRepositoryImpl(EventAdapter eventAdapter, AttendeeAdapter attendeeAd
     @Override
     public Observable<EventModel> loadAllEventsForRoom(long roomId) {
 
-        return eventAdapter.getEventsForRoom(roomId) //
-            .map(this::setEndIfCached)
-            .flatMap(loadAttendees());
+        return loadAllEventsForRoom(roomId, 1);
     }
 
 
+    @Override
+    public Observable<EventModel> loadAllEventsForRoom(long roomId, int days) {
+
+        return eventAdapter.getEventsForRoom(roomId, days) //
+                .map(this::setEndIfCached)
+                .flatMap(loadAttendees());
+    }
+
     private EventModel setEndIfCached(EventModel event) {
 
         DateTime end = eventEndCache.get(event.getId());
@@ -73,8 +77,8 @@ public boolean updateEvent(long eventId, DateTime start, DateTime end, boolean r
     private Function<EventModel, Observable<EventModel>> loadAttendees() {
 
         return
-            event ->
-                attendeeAdapter.getAttendeesForEvent(event.getId())
-                .collectInto(event, EventModel::addAttendee).toObservable();
+                event ->
+                        attendeeAdapter.getAttendeesForEvent(event.getId())
+                                .collectInto(event, EventModel::addAttendee).toObservable();
     }
 }

app/src/main/java/de/synyx/android/meeroo/domain/Agenda.kt

@@ -49,11 +49,11 @@ class Agenda {
     fun getCurrentMeeting() = reservations.firstOrNull { it.isCurrentlyActive }
 
 
-    fun getUpcomingReservation() = reservations.firstOrNull { it.isUpcoming }
+    fun getUpcomingReservation() = getReservationsToday().firstOrNull { it.isUpcoming }
 
 
     fun getSecondUpcomingReservation() =
-            reservations
+      getReservationsToday()
                     .filter { it.isUpcoming }
                     .drop(1)
                     .firstOrNull()
@@ -68,14 +68,16 @@ class Agenda {
     fun getReservations(): List<Reservation> = unmodifiableList<Reservation>(reservations)
 
 
-    fun hasCurrentReservation() = reservations.any { it.isCurrentlyActive }
+  fun hasCurrentReservation() = reservations.any { it.isCurrentlyActive }
 
 
-    private fun sumTimeOfOngoingReservations(): (TimeSpan, TimeSpan) -> TimeSpan {
+  private fun sumTimeOfOngoingReservations(): (TimeSpan, TimeSpan) -> TimeSpan {
 
-        return { available, nextTimeSpan ->
-            if (nextTimeSpan.begin.isAfter(available.end)) available
-            else TimeSpan(available.begin, nextTimeSpan.end)
-        }
+    return { available, nextTimeSpan ->
+      if (nextTimeSpan.begin.isAfter(available.end)) available
+      else TimeSpan(available.begin, nextTimeSpan.end)
     }
+  }
+
+  public fun getReservationsToday() = reservations.filter { it.isToday }
 }

app/src/main/java/de/synyx/android/meeroo/domain/MeetingRoom.kt

@@ -42,7 +42,7 @@ class MeetingRoom(val calendarId: Long, val name: String) {
     fun getUpcomingReservation(): Reservation? = agenda.getUpcomingReservation()
 
 
-    fun getReservations(): List<Reservation> = agenda.getReservations();
+    fun getReservations(): List<Reservation> = agenda.getReservations()
 
 
     fun getAvailabilityTime(): Duration? {

app/src/main/java/de/synyx/android/meeroo/domain/Reservation.java

@@ -110,6 +110,10 @@ public boolean isUpcoming() {
         return begin.isAfter(timeProvider.now());
     }
 
+    public boolean isToday() {
+        return begin.withTimeAtStartOfDay().equals(timeProvider.now().withTimeAtStartOfDay());
+    }
+
 
     public String getTitle() {
 

app/src/main/java/de/synyx/android/meeroo/screen/main/agenda/ReservationViewHolder.kt

@@ -0,0 +1,49 @@
+package de.synyx.android.meeroo.screen.main.agenda
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import de.synyx.android.meeroo.domain.Reservation
+import android.widget.TextView
+import de.synyx.android.meeroo.R
+import org.joda.time.DateTime
+import org.joda.time.LocalDate
+import org.joda.time.format.DateTimeFormat
+
+/**
+ * @author  Max Dobler - [email protected]
+ */
+class ReservationViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+  fun bind(item: AgendaListItem.ReservationItem) {
+    setTitle(item.reservation)
+    setTimespan(item.reservation)
+  }
+
+  private fun setTitle(reservation: Reservation) {
+    val reservationTitle = itemView.findViewById<TextView>(R.id.reservation_title)
+    reservationTitle.text = reservation.title
+  }
+
+  private fun setTimespan(reservation: Reservation) {
+    val reservationTimespan = itemView.findViewById<TextView>(R.id.reservation_timespan)
+    val beginTime = formatTime(reservation.getBegin())
+    val endTime = formatTime(reservation.getEnd())
+    reservationTimespan.text = String.format("%s - %s", beginTime, endTime)
+  }
+
+  private fun formatTime(dateTime: DateTime): String {
+    return DateTimeFormat.forPattern("HH:mm").print(dateTime)
+  }
+}
+
+class DateHeaderViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+  fun bind(dateHeader: AgendaListItem.DateHeader) {
+    val label = when (dateHeader.dateTime) {
+      LocalDate() -> itemView.context.getString(R.string.today)
+      LocalDate().plusDays(1) -> itemView.context.getString(R.string.tomorrow)
+      else -> DateTimeFormat.fullDate().print(dateHeader.dateTime)
+    }
+
+    itemView.findViewById<TextView>(R.id.date_header).text = label
+  }
+}