Skip to content

teams: smoother calendar meetup alert splitting (fixes #13087) #13020

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

Merged
dogi merged 4 commits into from
Apr 22, 2026
Merged

teams: smoother calendar meetup alert splitting (fixes #13087) #13020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a38c2ca
🧹 refactor: Extract functions from showMeetupAlert in TeamCalendarFra…
dogi Apr 16, 2026
37a1ef1
🐛 fix: Resolve bug where meetup added on calendar doesn't show up
dogi Apr 17, 2026
3d83aa4
Update version code and name in build.gradle
dogi Apr 22, 2026
1a20923
Merge branch 'master' into refactor-show-meetup-alert-158431597468200…
dogi Apr 22, 2026
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 @@ -12,8 +12,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdk = 26
targetSdk = 36
versionCode = 5361
versionName = "0.53.61"
versionCode = 5362
versionName = "0.53.62"
ndkVersion = '26.3.11579264'
vectorDrawables.useSupportLibrary = true
}
Expand Down
182 changes: 108 additions & 74 deletions app/src/main/java/org/ole/planet/myplanet/ui/teams/TeamCalendarFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,83 +85,29 @@ class TeamCalendarFragment : BaseTeamFragment() {
private fun showMeetupAlert() {
if (addMeetupDialog?.isShowing == true) return
val addMeetupBinding = AddMeetupBinding.inflate(layoutInflater)
setDatePickerListener(addMeetupBinding.tvStartDate, start, end)
setDatePickerListener(addMeetupBinding.tvEndDate, end, null)
setTimePicker(addMeetupBinding.tvStartTime)
setTimePicker(addMeetupBinding.tvEndTime)
setupMeetupDialogPickers(addMeetupBinding)

if (!::clickedCalendar.isInitialized) {
clickedCalendar = Calendar.getInstance()
}
addMeetupDialog = AlertDialog.Builder(requireActivity()).setView(addMeetupBinding.root).create()
addMeetupBinding.btnSave.setOnClickListener {
val title = "${addMeetupBinding.etTitle.text.trim()}"
val link = "${addMeetupBinding.etLink.text.trim()}"
val description = "${addMeetupBinding.etDescription.text.trim()}"
val location = "${addMeetupBinding.etLocation.text.trim()}"
if (title.isEmpty()) {
Utilities.toast(activity, getString(R.string.title_is_required))
} else if (description.isEmpty()) {
Utilities.toast(activity, getString(R.string.description_is_required))
} else if (!link.isValidWebLink() && link.isNotEmpty()) {
Utilities.toast(activity, getString(R.string.invalid_url))
} else {
val defaultPlaceholder = getString(R.string.click_here_to_pick_time)
val startTimeText = "${addMeetupBinding.tvStartTime.text}"
val endTimeText = "${addMeetupBinding.tvEndTime.text}"
val recurringId = addMeetupBinding.rgRecuring.checkedRadioButtonId
val rb = addMeetupBinding.rgRecuring.findViewById<RadioButton>(recurringId)
val recurringText = rb?.text?.toString()
val teamPlanetCode = team?.teamPlanetCode
val userName = user?.name
val startMillis = start.timeInMillis
val endMillis = end.timeInMillis
val currentTeamId = teamId

lifecycleScope.launch {
val meetup = RealmMeetup().apply {
id = "${UUID.randomUUID()}"
this.title = title
meetupLink = link
this.description = description
meetupLocation = location
creator = userName
startDate = startMillis
endDate = endMillis
if (startTimeText == defaultPlaceholder) {
startTime = ""
} else {
startTime = startTimeText
}
if (endTimeText == defaultPlaceholder) {
endTime = ""
} else {
endTime = endTimeText
}
createdDate = System.currentTimeMillis()
sourcePlanet = teamPlanetCode
val jo = JsonObject()
jo.addProperty("type", "local")
jo.addProperty("planetCode", teamPlanetCode)
sync = Gson().toJson(jo)
if (recurringText != null) {
recurring = recurringText
}
val ob = JsonObject()
ob.addProperty("teams", currentTeamId)
this.link = Gson().toJson(ob)
this.teamId = currentTeamId
}
val success = eventsRepository.createMeetup(meetup)
if (success) {
Utilities.toast(activity, getString(R.string.meetup_added))
addMeetupDialog?.dismiss()
refreshCalendarView()
refreshMeetupDialog()
} else {
Utilities.toast(activity, getString(R.string.meetup_not_added))
}
}
}
setupMeetupDialogButtons(addMeetupBinding)

addMeetupDialog?.show()
addMeetupDialog?.window?.setBackgroundDrawableResource(R.color.card_bg)
}

private fun setupMeetupDialogPickers(addMeetupBinding: AddMeetupBinding) {
setDatePickerListener(addMeetupBinding.tvStartDate, start, end)
setDatePickerListener(addMeetupBinding.tvEndDate, end, null)
setTimePicker(addMeetupBinding.tvStartTime)
setTimePicker(addMeetupBinding.tvEndTime)
}

private fun setupMeetupDialogButtons(addMeetupBinding: AddMeetupBinding) {
addMeetupBinding.btnSave.setOnClickListener {
handleMeetupSave(addMeetupBinding)
}

addMeetupBinding.btnCancel.setOnClickListener {
Expand All @@ -174,8 +120,88 @@ class TeamCalendarFragment : BaseTeamFragment() {
refreshCalendarView()
}
}
addMeetupDialog?.show()
addMeetupDialog?.window?.setBackgroundDrawableResource(R.color.card_bg)
}

private fun handleMeetupSave(addMeetupBinding: AddMeetupBinding) {
val title = "${addMeetupBinding.etTitle.text.trim()}"
val link = "${addMeetupBinding.etLink.text.trim()}"
val description = "${addMeetupBinding.etDescription.text.trim()}"
val location = "${addMeetupBinding.etLocation.text.trim()}"

if (title.isEmpty()) {
Utilities.toast(activity, getString(R.string.title_is_required))
} else if (description.isEmpty()) {
Utilities.toast(activity, getString(R.string.description_is_required))
} else if (!link.isValidWebLink() && link.isNotEmpty()) {
Utilities.toast(activity, getString(R.string.invalid_url))
} else {
saveMeetupToDatabase(addMeetupBinding, title, link, description, location)
}
}

private fun saveMeetupToDatabase(
addMeetupBinding: AddMeetupBinding,
title: String,
link: String,
description: String,
location: String
) {
val defaultPlaceholder = getString(R.string.click_here_to_pick_time)
val startTimeText = "${addMeetupBinding.tvStartTime.text}"
val endTimeText = "${addMeetupBinding.tvEndTime.text}"
val recurringId = addMeetupBinding.rgRecuring.checkedRadioButtonId
val rb = addMeetupBinding.rgRecuring.findViewById<RadioButton>(recurringId)
val recurringText = rb?.text?.toString()
val teamPlanetCode = team?.teamPlanetCode
val userName = user?.name
val startMillis = start.timeInMillis
val endMillis = end.timeInMillis
val currentTeamId = teamId

lifecycleScope.launch {
val meetup = RealmMeetup().apply {
id = "${UUID.randomUUID()}"
this.title = title
meetupLink = link
this.description = description
meetupLocation = location
creator = userName
startDate = startMillis
endDate = endMillis
if (startTimeText == defaultPlaceholder) {
startTime = ""
} else {
startTime = startTimeText
}
if (endTimeText == defaultPlaceholder) {
endTime = ""
} else {
endTime = endTimeText
}
createdDate = System.currentTimeMillis()
sourcePlanet = teamPlanetCode
val jo = JsonObject()
jo.addProperty("type", "local")
jo.addProperty("planetCode", teamPlanetCode)
sync = Gson().toJson(jo)
if (recurringText != null) {
recurring = recurringText
}
val ob = JsonObject()
ob.addProperty("teams", currentTeamId)
this.link = Gson().toJson(ob)
this.teamId = currentTeamId
}
val success = eventsRepository.createMeetup(meetup)
if (success) {
Utilities.toast(activity, getString(R.string.meetup_added))
addMeetupDialog?.dismiss()
refreshCalendarView()
refreshMeetupDialog()
} else {
Utilities.toast(activity, getString(R.string.meetup_not_added))
}
}
}

private fun setDatePickerListener(view: TextView, date: Calendar?, endDate: Calendar?) {
Expand Down Expand Up @@ -319,6 +345,10 @@ class TeamCalendarFragment : BaseTeamFragment() {
meetupDialog?.setOnDismissListener {
eventDates.add(clickedCalendar)
lifecycleScope.launch {
val calendarDays = eventDates.map { CalendarDay(it).apply {
imageResource = R.drawable.ic_calendar
} }
binding.calendarView.setCalendarDays(calendarDays)
binding.calendarView.selectedDates = emptyList()
binding.calendarView.selectedDates = eventDates.toList()
}
Expand All @@ -342,6 +372,10 @@ class TeamCalendarFragment : BaseTeamFragment() {
if (isAdded && activity != null) {
eventDates.clear()
eventDates.addAll(newDates)
val calendarDays = newDates.map { CalendarDay(it).apply {
imageResource = R.drawable.ic_calendar
} }
binding.calendarView.setCalendarDays(calendarDays)
binding.calendarView.selectedDates = ArrayList(newDates)
}
}
Expand Down
Loading