diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java index de3db3e..8e59ab1 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java @@ -15,6 +15,7 @@ import java.util.ArrayList; import de.sebse.fuplanner.R; import de.sebse.fuplanner.services.KVV.Announcement; import de.sebse.fuplanner.services.KVV.Assignment; +import de.sebse.fuplanner.services.KVV.Event; import de.sebse.fuplanner.services.KVV.Modules; import de.sebse.fuplanner.tools.Conversion; import de.sebse.fuplanner.tools.logging.Logger; @@ -31,6 +32,7 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter> mPositionalData; @@ -56,6 +58,8 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter(TYPE_HEADER, SECTION_ASSIGNMENT)); addPositionalListData(getAssignmentCount(), SECTION_ASSIGNMENT); + mPositionalData.add(new Pair<>(TYPE_HEADER, SECTION_EVENTS)); + addPositionalListData(getAssignmentCount(), SECTION_EVENTS); this.notifyDataSetChanged(); } @@ -120,6 +124,9 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter log.d("Refeerence to:", SECTION_ASSIGNMENT, index)); + break; + case SECTION_EVENTS: + Event event = mValue.events.get(index); + i.mTitle.setText(event.getTitle()); + i.mSubLeft.setText(event.getType()); + i.mSubRight.setText(i.mView.getResources().getString(R.string.date_scale, + Conversion.getModifiedDate(event.getStartDate()), + Conversion.getModifiedDate(event.getEndDate()) + )); + i.mView.setOnClickListener(view -> log.d("Refeerence to:", SECTION_ASSIGNMENT, index)); } case TYPE_SHOW_MORE: CustomViewHolder c = (CustomViewHolder) holder; @@ -168,6 +185,12 @@ public class ModDetailOverviewAdapter extends RecyclerView.Adapter announcements; public ArrayList assignments; + public ArrayList events; /*private Module() { this(null, null, null, null, null); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0226227..e1ebc8a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -26,4 +26,7 @@ Show All Assignments (%1$d) Assignments + Upcoming Events (%1$d) + Upcoming Events + %1$s - %2$s