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

Jump to bottom

courses: smoother mycourses joining (fixes #4602) #4660

Merged
merged 3 commits into from
Oct 17, 2024
Merged

courses: smoother mycourses joining (fixes #4602) #4660

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4912ea9
added prompt navigation
deeppp15 Oct 16, 2024
38894da
Update build.gradle
dogi Oct 17, 2024
149c2af
Merge branch 'master' into 4602-course-myCourse-navigation
dogi Oct 17, 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
42 changes: 37 additions & 5 deletions app/src/main/java/org/ole/planet/myplanet/ui/courses/CoursesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,23 @@ import org.ole.planet.myplanet.model.RealmTag.Companion.getTagsArray
import org.ole.planet.myplanet.model.RealmUserModel
import org.ole.planet.myplanet.service.UserProfileDbHandler
import org.ole.planet.myplanet.ui.resources.CollectionsFragment
import org.ole.planet.myplanet.utilities.DialogUtils
import org.ole.planet.myplanet.utilities.KeyboardUtils.setupUI
import java.util.Calendar
import java.util.UUID

class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSelected, TagClickListener {

companion object {
fun newInstance(isMyCourseLib: Boolean): CoursesFragment {
val fragment = CoursesFragment()
val args = Bundle()
args.putBoolean("isMyCourseLib", isMyCourseLib)
fragment.arguments = args
return fragment
}
}

private lateinit var tvAddToLib: TextView
private lateinit var tvSelected: TextView
private lateinit var etSearch: EditText
Expand Down Expand Up @@ -86,6 +98,9 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
btnRemove.visibility = View.VISIBLE
btnArchive.visibility = View.VISIBLE
checkList()
}else {
btnRemove.visibility = View.GONE
btnArchive.visibility = View.GONE
}

etSearch.addTextChangedListener(object : TextWatcher {
Expand Down Expand Up @@ -281,14 +296,31 @@ class CoursesFragment : BaseRecyclerFragment<RealmMyCourse?>(), OnCourseItemSele
msg += getString(R.string.return_to_the_home_tab_to_access_mycourses)
builder.setMessage(msg)
builder.setCancelable(true)
builder.setPositiveButton(R.string.ok) { dialog: DialogInterface, _: Int ->
dialog.cancel()
val newFragment = CoursesFragment()
recreateFragment(newFragment)
}
.setPositiveButton("Go to myCourses") { dialog: DialogInterface, _: Int ->
if (userModel?.id?.startsWith("guest") == true) {
DialogUtils.guestDialog(requireContext())
} else {
redirectToMyCourses();
}
}
.setNegativeButton(R.string.ok) { dialog: DialogInterface, _: Int ->
dialog.cancel()
val newFragment = CoursesFragment()
recreateFragment(newFragment)
}

return builder.create()
}

fun redirectToMyCourses() {
val fragment = CoursesFragment.newInstance(isMyCourseLib = true)

parentFragmentManager.beginTransaction()
.replace(R.id.fragment_container, fragment)
.addToBackStack(null)
.commit()
}

override fun onSelectedListChange(list: MutableList<RealmMyCourse?>) {
selectedItems = list
changeButtonStatus()
Expand Down