mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

Display both start and end time in events list (including bookmarks),

Browse source 
along with a shorter representation of the day name.
This commit is contained in:
Christophe Beyls 2014-01-25 16:31:18 +01:00
parent 70badc34c8
commit a25b8e432f
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/be/digitalia/fosdem/adapters/EventsAdapter.java
View file

@ -79,14 +79,14 @@ public class EventsAdapter extends CursorAdapter {
holder.trackName.setText(event.getTrack().getName()); holder.trackName.setText(event.getTrack().getName());
Date startTime = event.getStartTime(); Date startTime = event.getStartTime();
Date endTime = event.getEndTime();
String startTimeString = (startTime != null) ? TIME_DATE_FORMAT.format(startTime) : "?"; String startTimeString = (startTime != null) ? TIME_DATE_FORMAT.format(startTime) : "?";
String endTimeString = (endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?";
String details; String details;
if (showDay) { 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 { } else {
Date endTime = event.getEndTime(); details = String.format("%1$s ― %2$s | %3$s", startTimeString, endTimeString, event.getRoomName());
String endTimeString = (endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?";
details = String.format("%1$s - %2$s | %3$s", startTimeString, endTimeString, event.getRoomName());
} }
holder.details.setText(details); holder.details.setText(details);
} }

2
src/be/digitalia/fosdem/fragments/EventDetailsFragment.java
View file

@ -122,7 +122,7 @@ public class EventDetailsFragment extends Fragment {
((TextView) view.findViewById(R.id.track)).setText(event.getTrack().getName()); ((TextView) view.findViewById(R.id.track)).setText(event.getTrack().getName());
Date startTime = event.getStartTime(); Date startTime = event.getStartTime();
Date endTime = event.getEndTime(); 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) : "?"); (endTime != null) ? TIME_DATE_FORMAT.format(endTime) : "?");
((TextView) view.findViewById(R.id.time)).setText(text); ((TextView) view.findViewById(R.id.time)).setText(text);
final String roomName = event.getRoomName(); final String roomName = event.getRoomName();

4
src/be/digitalia/fosdem/model/Day.java
View file

@ -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)); 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 @Override
public String toString() { public String toString() {
return getName(); return getName();