msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added description and location to calendar preview

Browse Source
pull/172/head
M66B 5 years ago
parent a7acf34321
commit 8d06abfcd2
2 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File

70
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -361,6 +361,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private Group grpDownloading; private Group grpDownloading;
private TextView tvCalendarSummary; private TextView tvCalendarSummary;
private TextView tvCalendarDescription;
private TextView tvCalendarLocation;
private TextView tvCalendarStart; private TextView tvCalendarStart;
private TextView tvCalendarEnd; private TextView tvCalendarEnd;
private TextView tvAttendees; private TextView tvAttendees;
@ -496,6 +498,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvNoInternetHeaders = vsBody.findViewById(R.id.tvNoInternetHeaders); tvNoInternetHeaders = vsBody.findViewById(R.id.tvNoInternetHeaders);
tvCalendarSummary = vsBody.findViewById(R.id.tvCalendarSummary); tvCalendarSummary = vsBody.findViewById(R.id.tvCalendarSummary);
tvCalendarDescription = vsBody.findViewById(R.id.tvCalendarDescription);
tvCalendarLocation = vsBody.findViewById(R.id.tvCalendarLocation);
tvCalendarStart = vsBody.findViewById(R.id.tvCalendarStart); tvCalendarStart = vsBody.findViewById(R.id.tvCalendarStart);
tvCalendarEnd = vsBody.findViewById(R.id.tvCalendarEnd); tvCalendarEnd = vsBody.findViewById(R.id.tvCalendarEnd);
tvAttendees = vsBody.findViewById(R.id.tvAttendees); tvAttendees = vsBody.findViewById(R.id.tvAttendees);
@ -1068,11 +1072,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbHeaders.setVisibility(View.GONE); pbHeaders.setVisibility(View.GONE);
tvNoInternetHeaders.setVisibility(View.GONE); tvNoInternetHeaders.setVisibility(View.GONE);
tvCalendarSummary.setVisibility(View.GONE); clearCalendar();
tvCalendarStart.setVisibility(View.GONE);
tvCalendarEnd.setVisibility(View.GONE);
tvAttendees.setVisibility(View.GONE);
pbCalendarWait.setVisibility(View.GONE);
cbInline.setVisibility(View.GONE); cbInline.setVisibility(View.GONE);
btnSaveAttachments.setVisibility(View.GONE); btnSaveAttachments.setVisibility(View.GONE);
@ -1096,6 +1096,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
grpDownloading.setVisibility(View.GONE); grpDownloading.setVisibility(View.GONE);
} }
private void clearCalendar() {
tvCalendarSummary.setVisibility(View.GONE);
tvCalendarDescription.setVisibility(View.GONE);
tvCalendarLocation.setVisibility(View.GONE);
tvCalendarStart.setVisibility(View.GONE);
tvCalendarEnd.setVisibility(View.GONE);
tvAttendees.setVisibility(View.GONE);
pbCalendarWait.setVisibility(View.GONE);
}
private void bindFlagged(TupleMessageEx message, boolean expanded) { private void bindFlagged(TupleMessageEx message, boolean expanded) {
boolean pro = ActivityBilling.isPro(context); boolean pro = ActivityBilling.isPro(context);
int flagged = (message.count - message.unflagged); int flagged = (message.count - message.unflagged);
@ -1801,11 +1811,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
adapterAttachment.set(a); adapterAttachment.set(a);
if (!calendar) { if (!calendar) {
tvCalendarSummary.setVisibility(View.GONE); clearCalendar();
tvCalendarStart.setVisibility(View.GONE);
tvCalendarEnd.setVisibility(View.GONE);
tvAttendees.setVisibility(View.GONE);
pbCalendarWait.setVisibility(View.GONE);
grpCalendar.setVisibility(View.GONE); grpCalendar.setVisibility(View.GONE);
grpCalendarResponse.setVisibility(View.GONE); grpCalendarResponse.setVisibility(View.GONE);
} }
@ -1875,11 +1881,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (icalendar == null || if (icalendar == null ||
icalendar.getMethod() == null || icalendar.getMethod() == null ||
icalendar.getEvents().size() == 0) { icalendar.getEvents().size() == 0) {
tvCalendarSummary.setVisibility(View.GONE); clearCalendar();
tvCalendarStart.setVisibility(View.GONE);
tvCalendarEnd.setVisibility(View.GONE);
tvAttendees.setVisibility(View.GONE);
pbCalendarWait.setVisibility(View.GONE);
grpCalendar.setVisibility(View.GONE); grpCalendar.setVisibility(View.GONE);
grpCalendarResponse.setVisibility(View.GONE); grpCalendarResponse.setVisibility(View.GONE);
return; return;
@ -1889,10 +1891,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
VEvent event = icalendar.getEvents().get(0); VEvent event = icalendar.getEvents().get(0);
String summary = event.getSummary() == null ? null : event.getSummary().getValue(); String summary = (event.getSummary() == null ? null : event.getSummary().getValue());
String description = (event.getDescription() == null ? null : event.getDescription().getValue());
String location = (event.getLocation() == null ? null : event.getLocation().getValue());
ICalDate start = event.getDateStart() == null ? null : event.getDateStart().getValue(); ICalDate start = (event.getDateStart() == null ? null : event.getDateStart().getValue());
ICalDate end = event.getDateEnd() == null ? null : event.getDateEnd().getValue(); ICalDate end = (event.getDateEnd() == null ? null : event.getDateEnd().getValue());
List<String> attendee = new ArrayList<>(); List<String> attendee = new ArrayList<>();
for (Attendee a : event.getAttendees()) { for (Attendee a : event.getAttendees()) {
@ -1914,6 +1918,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
tvCalendarSummary.setText(summary); tvCalendarSummary.setText(summary);
tvCalendarSummary.setVisibility(summary == null ? View.GONE : View.VISIBLE); tvCalendarSummary.setVisibility(summary == null ? View.GONE : View.VISIBLE);
tvCalendarDescription.setText(description);
tvCalendarDescription.setVisibility(description == null ? View.GONE : View.VISIBLE);
tvCalendarLocation.setText(location);
tvCalendarLocation.setVisibility(location == null ? View.GONE : View.VISIBLE);
tvCalendarStart.setText(start == null ? null : DTF.format(start.getTime())); tvCalendarStart.setText(start == null ? null : DTF.format(start.getTime()));
tvCalendarStart.setVisibility(start == null ? View.GONE : View.VISIBLE); tvCalendarStart.setVisibility(start == null ? View.GONE : View.VISIBLE);
@ -1970,12 +1980,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (action == R.id.ibCalendar) { if (action == R.id.ibCalendar) {
String summary = (event.getSummary() == null ? null : event.getSummary().getValue()); String summary = (event.getSummary() == null ? null : event.getSummary().getValue());
String description = (event.getDescription() == null ? null : event.getDescription().getValue()); String description = (event.getDescription() == null ? null : event.getDescription().getValue());
String location = (event.getLocation() == null ? null : event.getLocation().getValue());
ICalDate start = (event.getDateStart() == null ? null : event.getDateStart().getValue()); ICalDate start = (event.getDateStart() == null ? null : event.getDateStart().getValue());
ICalDate end = (event.getDateEnd() == null ? null : event.getDateEnd().getValue()); ICalDate end = (event.getDateEnd() == null ? null : event.getDateEnd().getValue());
String location = (event.getLocation() == null ? null : event.getLocation().getValue());
List<String> attendee = new ArrayList<>(); List<String> attendee = new ArrayList<>();
for (Attendee a : event.getAttendees()) { for (Attendee a : event.getAttendees()) {
String email = a.getEmail(); String email = a.getEmail();
@ -1986,7 +1995,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// https://developer.android.com/guide/topics/providers/calendar-provider.html#intent-insert // https://developer.android.com/guide/topics/providers/calendar-provider.html#intent-insert
Intent intent = new Intent(Intent.ACTION_INSERT) Intent intent = new Intent(Intent.ACTION_INSERT)
.setData(CalendarContract.Events.CONTENT_URI) .setData(CalendarContract.Events.CONTENT_URI)
.putExtra(CalendarContract.Events.AVAILABILITY, CalendarContract.Events.AVAILABILITY_BUSY); .putExtra(CalendarContract.Events.AVAILABILITY, CalendarContract.Events.AVAILABILITY_BUSY)
.putExtra(CalendarContract.Events.STATUS, CalendarContract.Events.STATUS_CONFIRMED);
if (summary != null) if (summary != null)
intent.putExtra(CalendarContract.Events.TITLE, summary); intent.putExtra(CalendarContract.Events.TITLE, summary);
@ -1994,17 +2004,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
if (description != null) if (description != null)
intent.putExtra(CalendarContract.Events.DESCRIPTION, description); intent.putExtra(CalendarContract.Events.DESCRIPTION, description);
if (location != null)
intent.putExtra(CalendarContract.Events.EVENT_LOCATION, location);
if (start != null) if (start != null)
intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, start.getTime()); intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, start.getTime());
if (end != null) if (end != null)
intent.putExtra(CalendarContract.EXTRA_EVENT_END_TIME, end.getTime()); intent.putExtra(CalendarContract.EXTRA_EVENT_END_TIME, end.getTime());
if (location != null)
intent.putExtra(CalendarContract.Events.EVENT_LOCATION, location);
intent.putExtra(CalendarContract.Events.STATUS, CalendarContract.Events.STATUS_CONFIRMED);
if (attendee.size() > 0) if (attendee.size() > 0)
intent.putExtra(Intent.EXTRA_EMAIL, TextUtils.join(",", attendee)); intent.putExtra(Intent.EXTRA_EMAIL, TextUtils.join(",", attendee));
@ -2013,17 +2021,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
// https://tools.ietf.org/html/rfc5546#section-4.2.2 // https://tools.ietf.org/html/rfc5546#section-4.2.2
VEvent ev = new VEvent(); VEvent ev = new VEvent();
ev.setOrganizer(event.getOrganizer()); ev.setOrganizer(event.getOrganizer());
ev.setUid(event.getUid()); ev.setUid(event.getUid());
if (event.getSequence() != null) if (event.getSequence() != null)
ev.setSequence(event.getSequence()); ev.setSequence(event.getSequence());
ev.setSummary(event.getSummary());
ev.setDescription(event.getDescription());
ev.setLocation(event.getLocation());
if (event.getDateStart() != null) if (event.getDateStart() != null)
ev.setDateStart(event.getDateStart()); ev.setDateStart(event.getDateStart());
if (event.getDateEnd() != null) if (event.getDateEnd() != null)
ev.setDateEnd(event.getDateEnd()); ev.setDateEnd(event.getDateEnd());
ev.setSummary(event.getSummary());
ev.setDescription(event.getDescription());
ev.setLocation(event.getLocation());
InternetAddress to = (InternetAddress) message.to[0]; InternetAddress to = (InternetAddress) message.to[0];
Attendee attendee = new Attendee(to.getPersonal(), to.getAddress()); Attendee attendee = new Attendee(to.getPersonal(), to.getAddress());

28
app/src/main/res/layout/include_message_calendar.xml
Unescape View File

@ -30,6 +30,32 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/vSeparatorCalendar" /> app:layout_constraintTop_toBottomOf="@id/vSeparatorCalendar" />
<TextView
android:id="@+id/tvCalendarDescription"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:text="Description"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCalendarSummary" />
<TextView
android:id="@+id/tvCalendarLocation"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:text="Location"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCalendarDescription" />
<TextView <TextView
android:id="@+id/tvCalendarStart" android:id="@+id/tvCalendarStart"
android:layout_width="0dp" android:layout_width="0dp"
@ -41,7 +67,7 @@
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvCalendarSummary" /> app:layout_constraintTop_toBottomOf="@id/tvCalendarLocation" />
<TextView <TextView
android:id="@+id/tvCalendarEnd" android:id="@+id/tvCalendarEnd"

Write Preview
Loading…
Cancel
Save