Skip to content

Show day and month in agenda if begin / end is not today #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tknell wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Show day and month in agenda if begin / end is not today #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/main/java/de/synyx/android/meeroo/screen/main/agenda/ReservationViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import de.synyx.android.meeroo.domain.Reservation;

import org.joda.time.DateTime;
import org.joda.time.LocalDate;
import org.joda.time.format.DateTimeFormat;

import static java.lang.String.format;
Expand Down Expand Up @@ -52,6 +53,11 @@ private void setTimespan(Reservation reservation) {

private String formatTime(DateTime dateTime) {

return DateTimeFormat.forPattern("HH:mm").print(dateTime);
if(dateTime.toLocalDate().equals(LocalDate.now())){
return DateTimeFormat.forPattern("HH:mm").print(dateTime);
}else{
return DateTimeFormat.forPattern("d.MM HH:mm").print(dateTime);
}

}
}