diff --git a/app/build.gradle b/app/build.gradle index 307c94f66c..3a2d17c27e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "org.ole.planet.myplanet" minSdkVersion 21 targetSdkVersion 34 - versionCode 1191 - versionName "0.11.91" + versionCode 1192 + versionName "0.11.92" ndkVersion '21.3.6528147' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java index 026106b376..91e25908e4 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseRecyclerFragment.java @@ -117,9 +117,9 @@ public void addToMyList() { RealmRemovedLog.onAdd(mRealm, "resources", profileDbHandler.getUserModel().getId(), myObject.resourceId); Utilities.toast(getActivity(), getString(R.string.added_to_my_library)); } else { - RealmMyCourse myObject = RealmMyCourse.getMyCourse(mRealm, ((RealmMyCourse) object).getCourseId()); + RealmMyCourse myObject = RealmMyCourse.getMyCourse(mRealm, ((RealmMyCourse) object).courseId); RealmMyCourse.createMyCourse(myObject, mRealm, model.getId()); - RealmRemovedLog.onAdd(mRealm, "courses", profileDbHandler.getUserModel().getId(), myObject.getCourseId()); + RealmRemovedLog.onAdd(mRealm, "courses", profileDbHandler.getUserModel().getId(), myObject.courseId); Utilities.toast(getActivity(), getString(R.string.added_to_my_courses)); } } @@ -140,8 +140,8 @@ public void deleteSelected(boolean deleteProgress) { private void deleteCourseProgress(boolean deleteProgress, RealmObject object) { if (deleteProgress && object instanceof RealmMyCourse) { - mRealm.where(RealmCourseProgress.class).equalTo("courseId", ((RealmMyCourse) object).getCourseId()).findAll().deleteAllFromRealm(); - List examList = mRealm.where(RealmStepExam.class).equalTo("courseId", ((RealmMyCourse) object).getCourseId()).findAll(); + mRealm.where(RealmCourseProgress.class).equalTo("courseId", ((RealmMyCourse) object).courseId).findAll().deleteAllFromRealm(); + List examList = mRealm.where(RealmStepExam.class).equalTo("courseId", ((RealmMyCourse) object).courseId).findAll(); for (RealmStepExam exam : examList) { mRealm.where(RealmSubmission.class).equalTo("parentId", exam.getId()).notEqualTo("type", "survey").equalTo("uploaded", false).findAll().deleteAllFromRealm(); } @@ -156,7 +156,7 @@ public void onDestroy() { private void checkAndAddToList(RealmMyCourse course, List courses, List tags) { for (RealmTag tg : tags) { - long count = mRealm.where(RealmTag.class).equalTo("db", "courses").equalTo("tagId", tg.getId()).equalTo("linkId", course.getCourseId()).count(); + long count = mRealm.where(RealmTag.class).equalTo("db", "courses").equalTo("tagId", tg.getId()).equalTo("linkId", course.courseId).count(); if (count > 0 && !courses.contains(course)) courses.add(course); } } @@ -176,7 +176,7 @@ private List
  • getData(String s, Class c) { } private void searchAndAddToList(LI l, Class c, String[] query, List
  • li) { - String title = c == RealmMyLibrary.class ? ((RealmMyLibrary) l).title : ((RealmMyCourse) l).getCourseTitle(); + String title = c == RealmMyLibrary.class ? ((RealmMyLibrary) l).title : ((RealmMyCourse) l).courseTitle; boolean isExists = false; for (String q : query) { isExists = title.toLowerCase().contains(q.toLowerCase()); @@ -239,7 +239,7 @@ public List applyCourseFilter(List courses) { for (RealmMyCourse l : courses) { Utilities.log("grade " + gradeLevel); Utilities.log("subject " + subjectLevel); - if (TextUtils.equals(l.getGradeLevel(), gradeLevel) || TextUtils.equals(l.getSubjectLevel(), subjectLevel)) { + if (TextUtils.equals(l.gradeLevel, gradeLevel) || TextUtils.equals(l.subjectLevel, subjectLevel)) { newList.add(l); } } @@ -253,4 +253,4 @@ private boolean isValidFilter(RealmMyLibrary l) { boolean med = mediums.isEmpty() || mediums.contains(l.mediaType); return (sub && lev && lan && med); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java b/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java index 9ac34be9ca..39023633f3 100644 --- a/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/base/BaseResourceFragment.java @@ -264,9 +264,9 @@ public void removeFromShelf(RealmObject object) { RealmRemovedLog.onRemove(mRealm, "resources", model.getId(), ((RealmMyLibrary) object).resourceId); Utilities.toast(getActivity(), getString(R.string.removed_from_mylibrary)); } else { - RealmMyCourse myObject = RealmMyCourse.getMyCourse(mRealm, ((RealmMyCourse) object).getCourseId()); + RealmMyCourse myObject = RealmMyCourse.getMyCourse(mRealm, ((RealmMyCourse) object).courseId); myObject.removeUserId(model.getId()); - RealmRemovedLog.onRemove(mRealm, "courses", model.getId(), ((RealmMyCourse) object).getCourseId()); + RealmRemovedLog.onRemove(mRealm, "courses", model.getId(), ((RealmMyCourse) object).courseId); Utilities.toast(getActivity(), getString(R.string.removed_from_mycourse)); } } diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseProgress.java b/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseProgress.java index 456cabdcd0..c8a1fe8857 100644 --- a/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseProgress.java +++ b/app/src/main/java/org/ole/planet/myplanet/model/RealmCourseProgress.java @@ -59,12 +59,12 @@ public static HashMap getCourseProgress(Realm mRealm, String HashMap map = new HashMap<>(); for (RealmMyCourse course : r) { JsonObject object = new JsonObject(); - List steps = RealmCourseStep.getSteps(mRealm, course.getCourseId()); + List steps = RealmCourseStep.getSteps(mRealm, course.courseId); object.addProperty("max", steps.size()); - object.addProperty("current", getCurrentProgress(steps, mRealm, userId, course.getCourseId())); - if (RealmMyCourse.isMyCourse(userId, course.getCourseId(), mRealm)) - map.put(course.getCourseId(), object); + object.addProperty("current", getCurrentProgress(steps, mRealm, userId, course.courseId)); + if (RealmMyCourse.isMyCourse(userId, course.courseId, mRealm)) + map.put(course.courseId, object); } return map; } diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.java b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.java deleted file mode 100644 index b84b057d27..0000000000 --- a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.java +++ /dev/null @@ -1,248 +0,0 @@ -package org.ole.planet.myplanet.model; - -import static org.ole.planet.myplanet.MainApplication.context; - -import android.content.SharedPreferences; -import android.text.TextUtils; - -import com.google.gson.Gson; -import com.google.gson.JsonArray; -import com.google.gson.JsonObject; - -import org.ole.planet.myplanet.utilities.JsonUtils; -import org.ole.planet.myplanet.utilities.Utilities; - -import java.util.ArrayList; -import java.util.List; - -import io.realm.Realm; -import io.realm.RealmList; -import io.realm.RealmObject; -import io.realm.RealmResults; -import io.realm.annotations.PrimaryKey; - -public class RealmMyCourse extends RealmObject { - @PrimaryKey - private String id; - private RealmList userId; - private String courseId; - private String course_rev; - private String languageOfInstruction; - private String courseTitle; - private Integer memberLimit; - private String description; - private String method; - private String gradeLevel; - private String subjectLevel; - private String createdDate; - private Integer numberOfSteps; - - public static void insertMyCourses(String userId, JsonObject myCousesDoc, Realm mRealm) { - Utilities.log("INSERT COURSE " + new Gson().toJson(myCousesDoc)); - String id = JsonUtils.getString("_id", myCousesDoc); - RealmMyCourse myMyCoursesDB = mRealm.where(RealmMyCourse.class).equalTo("id", id).findFirst(); - if (myMyCoursesDB == null) { - myMyCoursesDB = mRealm.createObject(RealmMyCourse.class, id); - } - myMyCoursesDB.setUserId(userId); - myMyCoursesDB.setCourseId(JsonUtils.getString("_id", myCousesDoc)); - myMyCoursesDB.setCourse_rev(JsonUtils.getString("_rev", myCousesDoc)); - myMyCoursesDB.setLanguageOfInstruction(JsonUtils.getString("languageOfInstruction", myCousesDoc)); - myMyCoursesDB.setCourseTitle(JsonUtils.getString("courseTitle", myCousesDoc)); - myMyCoursesDB.setMemberLimit(JsonUtils.getInt("memberLimit", myCousesDoc)); - myMyCoursesDB.setDescription(JsonUtils.getString("description", myCousesDoc)); - String description = JsonUtils.getString("description", myCousesDoc); - ArrayList links = RealmCourseStep.extractLinks(description); - ArrayList concatenatedLinks = new ArrayList<>(); - - String baseUrl = Utilities.getUrl(); - for (String link : links) { - String concatenatedLink = baseUrl +"/"+ link; - concatenatedLinks.add(concatenatedLink); - } - Utilities.openDownloadService(context, concatenatedLinks); - myMyCoursesDB.setMethod(JsonUtils.getString("method", myCousesDoc)); - myMyCoursesDB.setGradeLevel(JsonUtils.getString("gradeLevel", myCousesDoc)); - myMyCoursesDB.setSubjectLevel(JsonUtils.getString("subjectLevel", myCousesDoc)); - myMyCoursesDB.setCreatedDate(JsonUtils.getString("createdDate", myCousesDoc)); - myMyCoursesDB.setnumberOfSteps(JsonUtils.getJsonArray("steps", myCousesDoc).size()); - RealmCourseStep.insertCourseSteps(myMyCoursesDB.getCourseId(), JsonUtils.getJsonArray("steps", myCousesDoc), JsonUtils.getJsonArray("steps", myCousesDoc).size(), mRealm); - } - - public static List getMyByUserId(Realm mRealm, SharedPreferences settings) { - RealmResults libs = mRealm.where(RealmMyCourse.class).findAll(); - List libraries = new ArrayList<>(); - for (RealmMyCourse item : libs) { - if (item.getUserId().contains(settings.getString("userId", "--"))) { - libraries.add(item); - } - } - return libraries; - } - - - public static List getMyCourseByUserId(String userId, List libs) { - List libraries = new ArrayList<>(); - for (RealmMyCourse item : libs) { - if (item.getUserId().contains(userId)) { - libraries.add(item); - } - } - return libraries; - } - - public static List getOurCourse(String userId, List libs) { - List libraries = new ArrayList<>(); - for (RealmMyCourse item : libs) { - if (!item.getUserId().contains(userId)) { - libraries.add(item); - } - } - return libraries; - } - - - public static boolean isMyCourse(String userId, String courseId, Realm realm) { - return RealmMyCourse.getMyCourseByUserId(userId, realm.where(RealmMyCourse.class).equalTo("courseId", courseId).findAll()).size() > 0; - } - - public static void insert(Realm mRealm, JsonObject doc) { - insertMyCourses("", doc, mRealm); - } - - public static RealmMyCourse getMyCourse(Realm mRealm, String id) { - return mRealm.where(RealmMyCourse.class).equalTo("courseId", id).findFirst(); - } - - public static void createMyCourse(RealmMyCourse course, Realm mRealm, String id) { - if (!mRealm.isInTransaction()) mRealm.beginTransaction(); - course.setUserId(id); - mRealm.commitTransaction(); - } - - public static JsonArray getMyCourseIds(Realm realm, String userId) { - List myCourses = getMyCourseByUserId(userId, realm.where(RealmMyCourse.class).findAll()); - JsonArray ids = new JsonArray(); - for (RealmObject lib : myCourses) { - ids.add(((RealmMyCourse) lib).getCourseId()); - } - return ids; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public RealmList getUserId() { - return userId; - } - - public void setUserId(String userId) { - if (this.userId == null) { - this.userId = new RealmList<>(); - } - - if (!this.userId.contains(userId) && !TextUtils.isEmpty(userId)) this.userId.add(userId); - } - - public void removeUserId(String userId) { - this.userId.remove(userId); - } - - public String getCourseId() { - return courseId; - } - - public void setCourseId(String courseId) { - this.courseId = courseId; - } - - public String getCourse_rev() { - return course_rev; - } - - public void setCourse_rev(String course_rev) { - this.course_rev = course_rev; - } - - public String getLanguageOfInstruction() { - return languageOfInstruction; - } - - public void setLanguageOfInstruction(String languageOfInstruction) { - this.languageOfInstruction = languageOfInstruction; - } - - public String getCourseTitle() { - return courseTitle; - } - - public void setCourseTitle(String courseTitle) { - this.courseTitle = courseTitle; - } - - public Integer getMemberLimit() { - return memberLimit; - } - - public void setMemberLimit(Integer memberLimit) { - this.memberLimit = memberLimit; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getMethod() { - return method; - } - - public void setMethod(String method) { - this.method = method; - } - - public String getGradeLevel() { - return gradeLevel; - } - - public void setGradeLevel(String gradeLevel) { - this.gradeLevel = gradeLevel; - } - - public String getSubjectLevel() { - return subjectLevel; - } - - public void setSubjectLevel(String subjectLevel) { - this.subjectLevel = subjectLevel; - } - - public String getCreatedDate() { - return createdDate; - } - - public void setCreatedDate(String createdDate) { - this.createdDate = createdDate; - } - - public Integer getnumberOfSteps() { - return numberOfSteps == null ? 0 : numberOfSteps; - } - - public void setnumberOfSteps(Integer numberOfSteps) { - this.numberOfSteps = numberOfSteps; - } - - @Override - public String toString() { - return courseTitle; - } -} diff --git a/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt new file mode 100644 index 0000000000..7e1cc6c455 --- /dev/null +++ b/app/src/main/java/org/ole/planet/myplanet/model/RealmMyCourse.kt @@ -0,0 +1,170 @@ +package org.ole.planet.myplanet.model + +import android.content.SharedPreferences +import android.text.TextUtils +import com.google.gson.Gson +import com.google.gson.JsonArray +import com.google.gson.JsonObject +import io.realm.Realm +import io.realm.RealmList +import io.realm.RealmObject +import io.realm.annotations.PrimaryKey +import org.ole.planet.myplanet.MainApplication +import org.ole.planet.myplanet.utilities.JsonUtils +import org.ole.planet.myplanet.utilities.Utilities + +open class RealmMyCourse : RealmObject() { + @JvmField + @PrimaryKey + var id: String? = null + var userId: RealmList? = null + private set + @JvmField + var courseId: String? = null + @JvmField + var course_rev: String? = null + @JvmField + var languageOfInstruction: String? = null + @JvmField + var courseTitle: String? = null + @JvmField + var memberLimit: Int? = null + @JvmField + var description: String? = null + @JvmField + var method: String? = null + @JvmField + var gradeLevel: String? = null + @JvmField + var subjectLevel: String? = null + @JvmField + var createdDate: String? = null + private var numberOfSteps: Int? = null + fun setUserId(userId: String?) { + if (this.userId == null) { + this.userId = RealmList() + } + if (!this.userId!!.contains(userId) && !TextUtils.isEmpty(userId)) this.userId!!.add(userId) + } + + fun removeUserId(userId: String?) { + this.userId!!.remove(userId) + } + + fun getnumberOfSteps(): Int { + return if (numberOfSteps == null) 0 else numberOfSteps!! + } + + fun setnumberOfSteps(numberOfSteps: Int?) { + this.numberOfSteps = numberOfSteps + } + + override fun toString(): String { + return courseTitle!! + } + + companion object { + @JvmStatic + fun insertMyCourses(userId: String?, myCousesDoc: JsonObject?, mRealm: Realm) { + Utilities.log("INSERT COURSE " + Gson().toJson(myCousesDoc)) + val id = JsonUtils.getString("_id", myCousesDoc) + var myMyCoursesDB = + mRealm.where(RealmMyCourse::class.java).equalTo("id", id).findFirst() + if (myMyCoursesDB == null) { + myMyCoursesDB = mRealm.createObject(RealmMyCourse::class.java, id) + } + myMyCoursesDB!!.setUserId(userId) + myMyCoursesDB.courseId = JsonUtils.getString("_id", myCousesDoc) + myMyCoursesDB.course_rev = JsonUtils.getString("_rev", myCousesDoc) + myMyCoursesDB.languageOfInstruction = JsonUtils.getString("languageOfInstruction", myCousesDoc) + myMyCoursesDB.courseTitle = JsonUtils.getString("courseTitle", myCousesDoc) + myMyCoursesDB.memberLimit = JsonUtils.getInt("memberLimit", myCousesDoc) + myMyCoursesDB.description = JsonUtils.getString("description", myCousesDoc) + val description = JsonUtils.getString("description", myCousesDoc) + val links = RealmCourseStep.extractLinks(description) + val concatenatedLinks = ArrayList() + val baseUrl = Utilities.getUrl() + for (link in links) { + val concatenatedLink = "$baseUrl/$link" + concatenatedLinks.add(concatenatedLink) + } + Utilities.openDownloadService(MainApplication.context, concatenatedLinks) + myMyCoursesDB.method = JsonUtils.getString("method", myCousesDoc) + myMyCoursesDB.gradeLevel = JsonUtils.getString("gradeLevel", myCousesDoc) + myMyCoursesDB.subjectLevel = JsonUtils.getString("subjectLevel", myCousesDoc) + myMyCoursesDB.createdDate = JsonUtils.getString("createdDate", myCousesDoc) + myMyCoursesDB.setnumberOfSteps(JsonUtils.getJsonArray("steps", myCousesDoc).size()) + RealmCourseStep.insertCourseSteps(myMyCoursesDB.courseId, + JsonUtils.getJsonArray("steps", myCousesDoc), + JsonUtils.getJsonArray("steps", myCousesDoc).size(), + mRealm + ) + } + + @JvmStatic + fun getMyByUserId(mRealm: Realm, settings: SharedPreferences): List { + val libs = mRealm.where(RealmMyCourse::class.java).findAll() + val libraries: MutableList = ArrayList() + for (item in libs) { + if (item.userId!!.contains(settings.getString("userId", "--"))) { + libraries.add(item) + } + } + return libraries + } + + @JvmStatic + fun getMyCourseByUserId(userId: String?, libs: List): List { + val libraries: MutableList = ArrayList() + for (item in libs) { + if (item.userId!!.contains(userId)) { + libraries.add(item) + } + } + return libraries + } + + @JvmStatic + fun getOurCourse(userId: String?, libs: List): List { + val libraries: MutableList = ArrayList() + for (item in libs) { + if (!item.userId!!.contains(userId)) { + libraries.add(item) + } + } + return libraries + } + + @JvmStatic + fun isMyCourse(userId: String?, courseId: String?, realm: Realm): Boolean { + return getMyCourseByUserId(userId, realm.where(RealmMyCourse::class.java).equalTo("courseId", courseId).findAll()).isNotEmpty() + } + + @JvmStatic + fun insert(mRealm: Realm, doc: JsonObject?) { + insertMyCourses("", doc, mRealm) + } + + @JvmStatic + fun getMyCourse(mRealm: Realm, id: String?): RealmMyCourse? { + return mRealm.where(RealmMyCourse::class.java).equalTo("courseId", id).findFirst() + } + + @JvmStatic + fun createMyCourse(course: RealmMyCourse, mRealm: Realm, id: String?) { + if (!mRealm.isInTransaction) mRealm.beginTransaction() + course.setUserId(id) + mRealm.commitTransaction() + } + + @JvmStatic + fun getMyCourseIds(realm: Realm, userId: String?): JsonArray { + val myCourses = getMyCourseByUserId(userId, realm.where(RealmMyCourse::class.java).findAll()) + val ids = JsonArray() + for (lib in myCourses) { + ids.add(lib.courseId) + } + return ids + } + } +} \ No newline at end of file diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java index 0d322a33db..9f7037817b 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/AdapterCourses.java @@ -102,9 +102,9 @@ public void setCourseList(List courseList) { private void sortCourseListByTitle() { Collections.sort(courseList, (course1, course2) -> { if (isTitleAscending) { - return course1.getCourseTitle().compareToIgnoreCase(course2.getCourseTitle()); + return course1.courseTitle.compareToIgnoreCase(course2.courseTitle); } else { - return course2.getCourseTitle().compareToIgnoreCase(course1.getCourseTitle()); + return course2.courseTitle.compareToIgnoreCase(course1.courseTitle); } }); } @@ -114,9 +114,9 @@ private void sortCourseList() { @Override public int compare(RealmMyCourse course1, RealmMyCourse course2) { if (isAscending) { - return course1.getCreatedDate().compareTo(course2.getCreatedDate()); + return course1.createdDate.compareTo(course2.createdDate); } else { - return course2.getCreatedDate().compareTo(course1.getCreatedDate()); + return course2.createdDate.compareTo(course1.createdDate); } } }); @@ -154,22 +154,22 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, final int if (holder instanceof ViewHoldercourse) { ViewHoldercourse viewHolder = (ViewHoldercourse) holder; viewHolder.bind(position); - viewHolder.rowCourseBinding.title.setText(courseList.get(position).getCourseTitle()); - viewHolder.rowCourseBinding.description.setText(courseList.get(position).getDescription()); - markwon.setMarkdown(viewHolder.rowCourseBinding.description, courseList.get(position).getDescription()); - setTextViewContent(viewHolder.rowCourseBinding.gradLevel, courseList.get(position).getGradeLevel(), viewHolder.rowCourseBinding.gradLevel, context.getString(R.string.grade_level_colon)); - setTextViewContent(viewHolder.rowCourseBinding.subjectLevel, courseList.get(position).getSubjectLevel(), viewHolder.rowCourseBinding.subjectLevel, context.getString(R.string.subject_level_colon)); + viewHolder.rowCourseBinding.title.setText(courseList.get(position).courseTitle); + viewHolder.rowCourseBinding.description.setText(courseList.get(position).description); + markwon.setMarkdown(viewHolder.rowCourseBinding.description, courseList.get(position).description); + setTextViewContent(viewHolder.rowCourseBinding.gradLevel, courseList.get(position).gradeLevel, viewHolder.rowCourseBinding.gradLevel, context.getString(R.string.grade_level_colon)); + setTextViewContent(viewHolder.rowCourseBinding.subjectLevel, courseList.get(position).subjectLevel, viewHolder.rowCourseBinding.subjectLevel, context.getString(R.string.subject_level_colon)); viewHolder.rowCourseBinding.checkbox.setChecked(selectedItems.contains(courseList.get(position))); viewHolder.rowCourseBinding.courseProgress.setMax(courseList.get(position).getnumberOfSteps()); displayTagCloud(viewHolder.rowCourseBinding.flexboxDrawable, position); try { - viewHolder.rowCourseBinding.tvDate.setText(TimeUtils.formatDate(Long.parseLong(courseList.get(position).getCreatedDate().trim()), "MMM dd, yyyy")); + viewHolder.rowCourseBinding.tvDate.setText(TimeUtils.formatDate(Long.parseLong(courseList.get(position).createdDate.trim()), "MMM dd, yyyy")); } catch (Exception e) { } viewHolder.rowCourseBinding.ratingBar.setOnTouchListener((v1, event) -> { if (event.getAction() == MotionEvent.ACTION_UP) - homeItemClickListener.showRatingDialog("course", courseList.get(position).getCourseId(), courseList.get(position).getCourseTitle(), ratingChangeListener); + homeItemClickListener.showRatingDialog("course", courseList.get(position).courseId, courseList.get(position).courseTitle, ratingChangeListener); return true; }); @@ -218,7 +218,7 @@ public void selectAllItems(boolean selectAll) { private void displayTagCloud(FlexboxLayout flexboxDrawable, int position) { flexboxDrawable.removeAllViews(); final ChipCloud chipCloud = new ChipCloud(context, flexboxDrawable, config); - List tags = mRealm.where(RealmTag.class).equalTo("db", "courses").equalTo("linkId", courseList.get(position).getId()).findAll(); + List tags = mRealm.where(RealmTag.class).equalTo("db", "courses").equalTo("linkId", courseList.get(position).id).findAll(); showTags(tags, chipCloud); } @@ -241,8 +241,8 @@ private void showChip(ChipCloud chipCloud, RealmTag parent) { private void showProgressAndRating(int position, RecyclerView.ViewHolder holder) { ViewHoldercourse viewHolder = (ViewHoldercourse) holder; showProgress(position, holder); - if (map.containsKey(courseList.get(position).getCourseId())) { - JsonObject object = map.get(courseList.get(position).getCourseId()); + if (map.containsKey(courseList.get(position).courseId)) { + JsonObject object = map.get(courseList.get(position).courseId); showRating(object, viewHolder.rowCourseBinding.average, viewHolder.rowCourseBinding.timesRated, viewHolder.rowCourseBinding.ratingBar); } else { viewHolder.rowCourseBinding.ratingBar.setRating(0); @@ -250,8 +250,8 @@ private void showProgressAndRating(int position, RecyclerView.ViewHolder holder) } private void showProgress(int position, RecyclerView.ViewHolder holder) { - if (progressMap.containsKey(courseList.get(position).getCourseId())) { - JsonObject ob = progressMap.get(courseList.get(position).getCourseId()); + if (progressMap.containsKey(courseList.get(position).courseId)) { + JsonObject ob = progressMap.get(courseList.get(position).courseId); rowCourseBinding.courseProgress.setMax(JsonUtils.getInt("max", ob)); rowCourseBinding.courseProgress.setProgress(JsonUtils.getInt("current", ob)); if (JsonUtils.getInt("current", ob) < JsonUtils.getInt("max", ob)) @@ -266,7 +266,7 @@ private void openCourse(RealmMyCourse realm_myCourses, int i) { if (homeItemClickListener != null) { Fragment f = new TakeCourseFragment(); Bundle b = new Bundle(); - b.putString("id", realm_myCourses.getCourseId()); + b.putString("id", realm_myCourses.courseId); b.putInt("position", i); f.setArguments(b); homeItemClickListener.openCallFragment(f); @@ -300,8 +300,8 @@ public ViewHoldercourse(RowCourseBinding rowCourseBinding) { public void onProgressChanged(SeekBar seekBar, int i, boolean b) { int position = getAdapterPosition(); if (position != RecyclerView.NO_POSITION && position < courseList.size()) { - if (progressMap.containsKey(courseList.get(getAdapterPosition()).getCourseId())) { - JsonObject ob = progressMap.get(courseList.get(getAdapterPosition()).getCourseId()); + if (progressMap.containsKey(courseList.get(getAdapterPosition()).courseId)) { + JsonObject ob = progressMap.get(courseList.get(getAdapterPosition()).courseId); int current = JsonUtils.getInt("current", ob); if (b && i <= current + 1) { openCourse(courseList.get(getAdapterPosition()), seekBar.getProgress()); diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java index 747626fb9b..4466417dc0 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseDetailFragment.java @@ -91,7 +91,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - initRatingView("course", courses.getCourseId(), courses.getCourseTitle(), this); + initRatingView("course", courses.courseId, courses.courseTitle, this); setCourseData(); } @@ -101,11 +101,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat } private void setCourseData() { - setTextViewVisibility(fragmentCourseDetailBinding.subjectLevel, courses.getSubjectLevel(), fragmentCourseDetailBinding.ltSubjectLevel); - setTextViewVisibility(fragmentCourseDetailBinding.method, courses.getMethod(), fragmentCourseDetailBinding.ltMethod); - setTextViewVisibility(fragmentCourseDetailBinding.gradeLevel, courses.getGradeLevel(), fragmentCourseDetailBinding.ltGradeLevel); - setTextViewVisibility(fragmentCourseDetailBinding.language, courses.getLanguageOfInstruction(), fragmentCourseDetailBinding.ltLanguage); - String markdownContentWithLocalPaths = CourseStepFragment.prependBaseUrlToImages(courses.getDescription(), "file://" + MainApplication.context.getExternalFilesDir(null) + "/ole/"); + setTextViewVisibility(fragmentCourseDetailBinding.subjectLevel, courses.subjectLevel, fragmentCourseDetailBinding.ltSubjectLevel); + setTextViewVisibility(fragmentCourseDetailBinding.method, courses.method, fragmentCourseDetailBinding.ltMethod); + setTextViewVisibility(fragmentCourseDetailBinding.gradeLevel, courses.gradeLevel, fragmentCourseDetailBinding.ltGradeLevel); + setTextViewVisibility(fragmentCourseDetailBinding.language, courses.languageOfInstruction, fragmentCourseDetailBinding.ltLanguage); + String markdownContentWithLocalPaths = CourseStepFragment.prependBaseUrlToImages(courses.description, "file://" + MainApplication.context.getExternalFilesDir(null) + "/ole/"); markwon.setMarkdown(fragmentCourseDetailBinding.description, markdownContentWithLocalPaths); fragmentCourseDetailBinding.noOfExams.setText(RealmStepExam.getNoOfExam(mRealm, id) + ""); final RealmResults resources = mRealm.where(RealmMyLibrary.class).equalTo("courseId", id).equalTo("resourceOffline", false).isNotNull("resourceLocalAddress").findAll(); @@ -125,14 +125,14 @@ private void setTextViewVisibility(TextView textView, String content, View layou } private void setStepsList() { - List steps = RealmCourseStep.getSteps(mRealm, courses.getCourseId()); + List steps = RealmCourseStep.getSteps(mRealm, courses.courseId); fragmentCourseDetailBinding.stepsList.setLayoutManager(new LinearLayoutManager(getActivity())); fragmentCourseDetailBinding.stepsList.setAdapter(new AdapterSteps(getActivity(), steps, mRealm)); } @Override public void onRatingChanged() { - JsonObject object = RealmRating.getRatingsById(mRealm, "course", courses.getCourseId(), user.getId()); + JsonObject object = RealmRating.getRatingsById(mRealm, "course", courses.courseId, user.getId()); setRatings(object); } diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java index c43a87d74d..c3e0cc9570 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/CourseFragment.java @@ -204,11 +204,11 @@ private AlertDialog createAlertDialog() { String msg = getString(R.string.success_you_have_added_the_following_courses); if (selectedItems.size() <= 5) { for (int i = 0; i < selectedItems.size(); i++) { - msg += " - " + selectedItems.get(i).getCourseTitle() + "\n"; + msg += " - " + selectedItems.get(i).courseTitle + "\n"; } } else { for (int i = 0; i < 5; i++) { - msg += " - " + selectedItems.get(i).getCourseTitle() + "\n"; + msg += " - " + selectedItems.get(i).courseTitle + "\n"; } msg += getString(R.string.and) + (selectedItems.size() - 5) + getString(R.string.more_course_s); } diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/course/TakeCourseFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/course/TakeCourseFragment.java index e0433ba4df..ab6e5575cb 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/course/TakeCourseFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/course/TakeCourseFragment.java @@ -72,7 +72,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - fragmentTakeCourseBinding.tvCourseTitle.setText(currentCourse.getCourseTitle()); + fragmentTakeCourseBinding.tvCourseTitle.setText(currentCourse.courseTitle); steps = RealmCourseStep.getSteps(mRealm, courseId); if (steps == null || steps.size() == 0) { fragmentTakeCourseBinding.nextStep.setVisibility(View.GONE); @@ -117,7 +117,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } private void setCourseData() { - fragmentTakeCourseBinding.tvStepTitle.setText(currentCourse.getCourseTitle()); + fragmentTakeCourseBinding.tvStepTitle.setText(currentCourse.courseTitle); if (!currentCourse.getUserId().contains(userModel.getId())) { fragmentTakeCourseBinding.btnRemove.setVisibility(View.VISIBLE); fragmentTakeCourseBinding.btnRemove.setText(getString(R.string.join)); @@ -147,7 +147,7 @@ public void onPageSelected(int position) { } else { fragmentTakeCourseBinding.nextStep.setClickable(true); fragmentTakeCourseBinding.nextStep.setTextColor(getResources().getColor(R.color.md_white_1000)); - fragmentTakeCourseBinding.tvStepTitle.setText(currentCourse.getCourseTitle()); + fragmentTakeCourseBinding.tvStepTitle.setText(currentCourse.courseTitle); } int i = RealmCourseProgress.getCurrentProgress(steps, mRealm, userModel.getId(), courseId); if (i < steps.size()) fragmentTakeCourseBinding.courseProgress.setSecondaryProgress(i + 1); diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.java index 72e2c3a6a9..44bfd91ddc 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/team/MyTeamsDetailFragment.java @@ -232,7 +232,7 @@ private void setCourseList(TabLayout.Tab tab, RealmResults course listContent.setAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1, courses)); listContent.setOnItemClickListener((adapterView, view, i, l) -> { if (homeItemClickListener != null) { - openFragment(courses.get(i).getCourseId(), new TakeCourseFragment()); + openFragment(courses.get(i).courseId, new TakeCourseFragment()); } }); } diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/team/teamCourse/AdapterTeamCourse.java b/app/src/main/java/org/ole/planet/myplanet/ui/team/teamCourse/AdapterTeamCourse.java index 2d4e8b7a35..3b8cbc8370 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/team/teamCourse/AdapterTeamCourse.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/team/teamCourse/AdapterTeamCourse.java @@ -48,12 +48,12 @@ public ViewHolderTeamCourse onCreateViewHolder(@NonNull ViewGroup parent, int vi @Override public void onBindViewHolder(@NonNull ViewHolderTeamCourse holder, int position) { - rowTeamResourceBinding.tvTitle.setText(list.get(position).getCourseTitle()); - rowTeamResourceBinding.tvDescription.setText(list.get(position).getDescription()); + rowTeamResourceBinding.tvTitle.setText(list.get(position).courseTitle); + rowTeamResourceBinding.tvDescription.setText(list.get(position).description); holder.itemView.setOnClickListener(v -> { if (listener != null) { Bundle b = new Bundle(); - b.putString("id", list.get(position).getCourseId()); + b.putString("id", list.get(position).courseId); listener.openCallFragment(TakeCourseFragment.newInstance(b)); } });