Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dashboard: smoother badges (fixes #4463) #4464

Merged
merged 3 commits into from
Sep 24, 2024
Merged

dashboard: smoother badges (fixes #4463) #4464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f12198
show accurate completed badge
Okuro3499 Sep 23, 2024
36a2bc2
Update build.gradle
dogi Sep 24, 2024
5904221
Merge branch 'master' into 4463-completed-course-inconsistency
dogi Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdkVersion 21
targetSdkVersion 34
versionCode 1948
versionName "0.19.48"
versionCode 1949
versionName "0.19.49"
ndkVersion '21.3.6528147'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
54 changes: 21 additions & 33 deletions app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ import org.ole.planet.myplanet.databinding.FragmentHomeBellBinding
import org.ole.planet.myplanet.model.RealmCertification
import org.ole.planet.myplanet.model.RealmCourseProgress
import org.ole.planet.myplanet.model.RealmMyCourse
import org.ole.planet.myplanet.model.RealmMyCourse.Companion.getCourseByCourseId
import org.ole.planet.myplanet.model.RealmMyCourse.Companion.getCourseSteps
import org.ole.planet.myplanet.model.RealmStepExam
import org.ole.planet.myplanet.model.RealmSubmission
import org.ole.planet.myplanet.model.RealmUserModel
Expand Down Expand Up @@ -149,26 +147,31 @@ class BellDashboardFragment : BaseDashboardFragment() {

private fun showBadges() {
fragmentHomeBellBinding.cardProfileBell.llBadges.removeAllViews()
val courseCount = countCourseIds(mRealm)

for ((index, entry) in courseCount.withIndex()) {
val completedCourses = getCompletedCourses(mRealm, user?.id)
completedCourses.forEachIndexed { index, course ->
val rootView = requireActivity().findViewById<ViewGroup>(android.R.id.content)
val star = LayoutInflater.from(activity).inflate(R.layout.image_start, rootView, false) as ImageView
val courseId = entry.keys.first()
val count = entry.values.first()
val steps = getCourseSteps(mRealm, courseId)
if (count.toInt() == steps.size) {
setColor(courseId, star)
fragmentHomeBellBinding.cardProfileBell.llBadges.addView(star)
star.setOnClickListener {
val course = getCourseByCourseId(courseId, mRealm)
star.contentDescription = "${getString(R.string.completed_course)} ${course?.courseTitle}"
openCourse(course, index)
}
setColor(course.courseId, star)
fragmentHomeBellBinding.cardProfileBell.llBadges.addView(star)
star.contentDescription = "${getString(R.string.completed_course)} ${course.courseTitle}"
star.setOnClickListener {
openCourse(course, index)
}
}
}

private fun getCompletedCourses(realm: Realm, userId: String?): List<RealmMyCourse> {
val myCourses = RealmMyCourse.getMyCourseByUserId(userId, realm.where(RealmMyCourse::class.java).findAll())
val courseProgress = RealmCourseProgress.getCourseProgress(realm, userId)

return myCourses.filter { course ->
val progress = courseProgress[course.id]
progress?.let {
it.asJsonObject["current"].asInt == it.asJsonObject["max"].asInt
} ?: false
}
}

private fun openCourse(realmMyCourses: RealmMyCourse?, position: Int) {
if (homeItemClickListener != null) {
val f: Fragment = TakeCourseFragment()
Expand All @@ -180,28 +183,13 @@ class BellDashboardFragment : BaseDashboardFragment() {
}
}

private fun countCourseIds(mRealm: Realm): List<Map<String, Long>> {
val courseIdCounts: MutableMap<String, Long> = HashMap()
val results = mRealm.where(RealmCourseProgress::class.java).findAll()
for (progress in results) {
val courseId = progress.courseId
if (courseId != null) {
if (courseIdCounts.containsKey(courseId)) {
courseIdCounts[courseId] = courseIdCounts[courseId]!! + 1
} else {
courseIdCounts[courseId] = 1
}
}
}
return courseIdCounts.map { mapOf(it.key to it.value) }
}

private fun setColor(courseId: String, star: ImageView) =
private fun setColor(courseId: String?, star: ImageView) {
if (RealmCertification.isCourseCertified(mRealm, courseId)) {
star.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimary))
} else {
star.setColorFilter(ContextCompat.getColor(requireContext(), R.color.md_blue_grey_300))
}
}

private fun declareElements() {
fragmentHomeBellBinding.homeCardTeams.llHomeTeam.setOnClickListener { homeItemClickListener?.openCallFragment(TeamFragment()) }
Expand Down