mirror of
https://github.com/MatomoCamp/matomocamp-companion-android.git
synced 2024-09-19 16:13:46 +02:00
Display both start and end time in events list (including bookmarks),
along with a shorter representation of the day name.
This commit is contained in:
parent
70badc34c8
commit
a25b8e432f
3 changed files with 9 additions and 5 deletions
|
@ -79,14 +79,14 @@ public class EventsAdapter extends CursorAdapter {
|
|||
holder.trackName.setText(event.getTrack().getName());
|
||||
|
||||
Date startTime = event.getStartTime();
|
||||
Date endTime = event.getEndTime();
|
||||
String startTimeString = (startTime != null) ? TIME_DATE_FORMAT.format(startTime) : "?";
|
||||
String endTimeString = (endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?";
|
||||
String details;
|
||||
if (showDay) {
|
||||
details = String.format("%1$s, %2$s | %3$s", event.getDay().toString(), startTimeString, event.getRoomName());
|
||||
details = String.format("%1$s, %2$s ― %3$s | %4$s", event.getDay().getShortName(), startTimeString, endTimeString, event.getRoomName());
|
||||
} else {
|
||||
Date endTime = event.getEndTime();
|
||||
String endTimeString = (endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?";
|
||||
details = String.format("%1$s - %2$s | %3$s", startTimeString, endTimeString, event.getRoomName());
|
||||
details = String.format("%1$s ― %2$s | %3$s", startTimeString, endTimeString, event.getRoomName());
|
||||
}
|
||||
holder.details.setText(details);
|
||||
}
|
||||
|
|
|
@ -122,7 +122,7 @@ public class EventDetailsFragment extends Fragment {
|
|||
((TextView) view.findViewById(R.id.track)).setText(event.getTrack().getName());
|
||||
Date startTime = event.getStartTime();
|
||||
Date endTime = event.getEndTime();
|
||||
text = String.format("%1$s, %2$s - %3$s", event.getDay().toString(), (startTime != null) ? TIME_DATE_FORMAT.format(startTime) : "?",
|
||||
text = String.format("%1$s, %2$s ― %3$s", event.getDay().toString(), (startTime != null) ? TIME_DATE_FORMAT.format(startTime) : "?",
|
||||
(endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?");
|
||||
((TextView) view.findViewById(R.id.time)).setText(text);
|
||||
final String roomName = event.getRoomName();
|
||||
|
|
|
@ -43,6 +43,10 @@ public class Day implements Parcelable {
|
|||
return String.format(Locale.US, "Day %1$d (%2$s)", index, DAY_DATE_FORMAT.format(date));
|
||||
}
|
||||
|
||||
public String getShortName() {
|
||||
return DAY_DATE_FORMAT.format(date);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getName();
|
||||
|
|
Loading…
Reference in a new issue