sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Event end time optimized

Browse Source
This commit is contained in:
Caesar2011
2019-01-14 14:04:30 +01:00
parent 6f1705ccf4
commit 729d3165f7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailEventAdapter.java
View File

@@ -178,7 +178,7 @@ class ModDetailEventAdapter extends RecyclerView.Adapter<CustomViewHolder> {
end = UtilsDate.getModifiedDate(lastDateTime); end = UtilsDate.getModifiedDate(lastDateTime);
weekday = UtilsDate.getModifiedDate(context, firstDateTime, "E"); weekday = UtilsDate.getModifiedDate(context, firstDateTime, "E");
startTime = UtilsDate.getModifiedTime(context, firstDateTime); startTime = UtilsDate.getModifiedTime(context, firstDateTime);
endTime = UtilsDate.getModifiedTime(context, lastDateTime); endTime = UtilsDate.getModifiedTime(context, lastDateTime+1);
for (long skippedDate : group.getSkippedDates()) { for (long skippedDate : group.getSkippedDates()) {
if (excepts == null) { if (excepts == null) {
excepts = new StringBuilder(UtilsDate.getModifiedDate(skippedDate)); excepts = new StringBuilder(UtilsDate.getModifiedDate(skippedDate));
@@ -199,9 +199,9 @@ class ModDetailEventAdapter extends RecyclerView.Adapter<CustomViewHolder> {
else else
start = UtilsDate.getModifiedDateTime(context, event.getStartDate()); start = UtilsDate.getModifiedDateTime(context, event.getStartDate());
if (UtilsDate.dateEquals(event.getStartDate(), event.getEndDate())) if (UtilsDate.dateEquals(event.getStartDate(), event.getEndDate()))
end = UtilsDate.getModifiedTime(context, event.getEndDate()); end = UtilsDate.getModifiedTime(context, event.getEndDate()+1);
else else
end = UtilsDate.getModifiedDateTime(context, event.getEndDate()); end = UtilsDate.getModifiedDateTime(context, event.getEndDate()+1);
date = context.getString(R.string.date_scale, start, end); date = context.getString(R.string.date_scale, start, end);
iu.mTitle.setText(event.getTitle()); iu.mTitle.setText(event.getTitle());
iu.mSubLeft.setText(date); iu.mSubLeft.setText(date);

4
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
View File

@@ -193,9 +193,9 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
else else
start = UtilsDate.getModifiedDateTime(i.mView.getContext(), event.getStartDate()); start = UtilsDate.getModifiedDateTime(i.mView.getContext(), event.getStartDate());
if (UtilsDate.dateEquals(event.getStartDate(), event.getEndDate())) if (UtilsDate.dateEquals(event.getStartDate(), event.getEndDate()))
end = UtilsDate.getModifiedTime(i.mView.getContext(), event.getEndDate()); end = UtilsDate.getModifiedTime(i.mView.getContext(), event.getEndDate()+1);
else else
end = UtilsDate.getModifiedDateTime(i.mView.getContext(), event.getEndDate()); end = UtilsDate.getModifiedDateTime(i.mView.getContext(), event.getEndDate()+1);
i.mSubRight.setText(i.mView.getResources().getString(R.string.date_scale, i.mSubRight.setText(i.mView.getResources().getString(R.string.date_scale,
start, end start, end
)); ));