Fix bug

Author: kafri8889

app/src/main/java/com/anafthdev/remindme/common/RemindMeAlarmManager.kt

@@ -13,6 +13,7 @@ import com.anafthdev.remindme.extension.calendarDayOfWeekFromRemindMeDayOfWeek
 import com.anafthdev.remindme.extension.calendarDayOfWeekToRemindMeDayOfWeek
 import com.anafthdev.remindme.extension.next
 import com.anafthdev.remindme.receiver.ReminderReceiver
+import timber.log.Timber
 import java.util.Calendar
 import javax.inject.Inject
 
@@ -84,27 +85,39 @@ class RemindMeAlarmManager @Inject constructor(
 
 			when {
 				System.currentTimeMillis() < timeInMillis -> {}
+				reminder.repeatOnDays.isEmpty() -> {}
 				reminder.repeatOnDays.size == DayOfWeek.values().size -> {
 					add(Calendar.DAY_OF_MONTH, 1)
 				}
 				else -> {
 					val currentDay = calendarDayOfWeekToRemindMeDayOfWeek(get(Calendar.DAY_OF_WEEK))
+					var nextWeek = false
 					val nextDay = run {
 						var day = currentDay
 
 						do {
 							day = day.next()
 
 							if (day in reminder.repeatOnDays) {
+								Timber.i("return day: ${day.name}")
+								
+								nextWeek = currentDay == day
+								
 								return@run day
 							}
 						} while (day !in reminder.repeatOnDays)
 
-						return@run currentDay
+						return@run currentDay  // Default value
 					}
 
-					if (nextDay.ordinal < currentDay.ordinal) {
+					Timber.i("cur day: $currentDay, next day: $nextDay")
+					
+					if (nextDay.ordinal < currentDay.ordinal || nextWeek) {
+						// Jika hari selanjutnya < hari sekarang
+						// Berarti next triggernya minggu besok
 						add(Calendar.WEEK_OF_MONTH, 1)
+						
+						Timber.i("trigger next week!")
 					}
 
 					set(Calendar.DAY_OF_WEEK, calendarDayOfWeekFromRemindMeDayOfWeek(nextDay))

app/src/main/java/com/anafthdev/remindme/receiver/ReminderReceiver.kt

@@ -14,6 +14,7 @@ import com.anafthdev.remindme.extension.calendarDayOfWeekFromRemindMeDayOfWeek
 import com.anafthdev.remindme.extension.calendarDayOfWeekToRemindMeDayOfWeek
 import com.anafthdev.remindme.extension.next
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import java.util.Calendar
 import javax.inject.Inject
 
@@ -36,31 +37,44 @@ class ReminderReceiver: BroadcastReceiver() {
 				} ?: Reminder.Null
 
 				val nextTrigger =  Calendar.getInstance().apply {
-					if (reminder.repeatOnDays.size == DayOfWeek.values().size) {
-						add(Calendar.DAY_OF_MONTH, 1)
-					} else {
-						val currentDay = calendarDayOfWeekToRemindMeDayOfWeek(get(Calendar.DAY_OF_WEEK))
-						val nextDay = run {
-							var day = currentDay
+					when {
+						reminder.repeatOnDays.isEmpty() -> {}
+						reminder.repeatOnDays.size == DayOfWeek.values().size -> {
+							add(Calendar.DAY_OF_MONTH, 1)
+						}
+						else -> {
+							val currentDay = calendarDayOfWeekToRemindMeDayOfWeek(get(Calendar.DAY_OF_WEEK))
+							var nextWeek = false
+							val nextDay = run {
+								var day = currentDay
+								
+								do {
+									day = day.next()
+									
+									if (day in reminder.repeatOnDays) {
+										Timber.i("return day: ${day.name}")
+										
+										nextWeek = currentDay == day
+										
+										return@run day
+									}
+								} while (day !in reminder.repeatOnDays)
+								
+								return@run currentDay  // Default value
+							}
 
-							do {
-								day = day.next()
+							Timber.i("cur day: $currentDay, next day: $nextDay")
+							
+							if (nextDay.ordinal < currentDay.ordinal || nextWeek) {
+								// Jika hari selanjutnya < hari sekarang
+								// Berarti next triggernya minggu besok
+								add(Calendar.WEEK_OF_MONTH, 1)
 
-								if (day in reminder.repeatOnDays) {
-									return@run day
-								}
-							} while (day !in reminder.repeatOnDays)
+								Timber.i("trigger next week!")
+							}
 
-							return@run currentDay  // Default value
-						}
-						
-						if (nextDay.ordinal < currentDay.ordinal) {
-							// Jika hari selanjutnya < hari sekarang
-							// Berarti next triggernya minggu besok
-							add(Calendar.WEEK_OF_MONTH, 1)
+							set(Calendar.DAY_OF_WEEK, calendarDayOfWeekFromRemindMeDayOfWeek(nextDay))
 						}
-						
-						set(Calendar.DAY_OF_WEEK, calendarDayOfWeekFromRemindMeDayOfWeek(nextDay))
 					}
 
 					set(Calendar.HOUR_OF_DAY, reminder.hour)

app/src/main/java/com/anafthdev/remindme/ui/main/MainScreen.kt

@@ -406,6 +406,8 @@ fun RemindMeReminderDetail(
 
 								add(message to ReminderMessageType.Fixed)
 							}
+							
+							viewModel.saveReminder()
 						},
 						modifier = reminderMessageModifier
 							.imePadding()

app/src/main/java/com/anafthdev/remindme/ui/remind_me/RemindMeViewModel.kt

@@ -67,8 +67,11 @@ class RemindMeViewModel @Inject constructor(
 	}
 
 	fun updateReminder(reminder: Reminder) {
-		if (reminder.isActive) remindMeAlarmManager.validateAndStart(reminder)
-		else remindMeAlarmManager.cancelReminder(reminder)
+		if (reminder.isActive) {
+			if (reminder.repeatOnDays.isNotEmpty()) {
+				remindMeAlarmManager.validateAndStart(reminder)
+			}
+		} else remindMeAlarmManager.cancelReminder(reminder)
 
 		viewModelScope.launch(Dispatchers.IO) {
 			reminderRepository.updateReminder(reminder.toReminderDb())
@@ -102,6 +105,8 @@ class RemindMeViewModel @Inject constructor(
 
 			if (deleteCurrentReminder) {
 				_uiState.value.selectedReminder?.let {
+					remindMeAlarmManager.cancelReminder(it)
+					
 					_uiState.value = _uiState.value.copy(
 						selectedReminder = null
 					)