From 1bbb09499df84fd02a5ec0f8932cb274ef14a5d8 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Tue, 5 Feb 2019 20:21:14 +0100 Subject: [PATCH] Module description --- .../moddetails/ModDetailOverviewAdapter.java | 16 ++++++++++++++-- .../fuplanner/services/kvv/ModulesList.java | 3 ++- 2 files changed, 16 insertions(+), 3 deletions(-) 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 dd04cf8..b9d268d 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 @@ -2,6 +2,7 @@ package de.sebse.fuplanner.fragments.moddetails; import android.content.Intent; import android.net.Uri; +import android.text.TextUtils; import android.util.Pair; import android.view.LayoutInflater; import android.view.View; @@ -37,6 +38,7 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter(TYPE_HEADER, ModulePart.DESCRIPTION)); - mPositionalData.add(new Pair<>(TYPE_DESCRIPTION, null)); + if (!TextUtils.isEmpty(mValue.description)) { + mPositionalData.add(new Pair<>(TYPE_HEADER, ModulePart.DESCRIPTION)); + mPositionalData.add(new Pair<>(TYPE_DESCRIPTION, null)); + } mPositionalData.add(new Pair<>(TYPE_SHORTCUTS, null)); mPositionalData.add(new Pair<>(TYPE_HEADER, ModulePart.LECTURERS)); for (int i = 0; i < mValue.lecturer.size(); i++) { @@ -79,6 +83,9 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter MAX_ITEMS_PER_PREVIEW) mPositionalData.add(new Pair<>(TYPE_SHOW_MORE, category)); + if (count == 0) { + mPositionalData.add(new Pair<>(TYPE_NO_ITEMS, category)); + } } @NonNull @@ -102,6 +109,10 @@ class ModDetailOverviewAdapter extends RecyclerView.Adapter { if (mListener != null) mListener.gotoFragmentPart((Integer) data.second, -1); diff --git a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java index 508f00d..8b826b7 100644 --- a/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java +++ b/app/src/main/java/de/sebse/fuplanner/services/kvv/ModulesList.java @@ -272,6 +272,7 @@ public class ModulesList extends HTTPService { try { JSONObject json = new JSONObject(body1); String name = json.getString("name"); + String description = json.optString("description", null); String type, lvNumber, semYear, semType; Semester semester = null; HashSet lvNumberSet = new HashSet<>(); @@ -297,7 +298,7 @@ public class ModulesList extends HTTPService { Semester finalSemester = semester; String finalType = type; lecturer().getBBLecturers(courseId, success -> { - modulesKVV.addModule(finalSemester, lvNumberSet, name, success, finalType, "", courseId, Modules.TYPE_BB); + modulesKVV.addModule(finalSemester, lvNumberSet, name, success, finalType, description, courseId, Modules.TYPE_BB); if (--latch[0] == 0) callback.onResponse(modulesKVV); }, error -> { log.e(error);