fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

last modifications

This commit is contained in:
MariemMARZOUGUI 2023-12-05 21:02:19 +01:00
parent e9a2c89de0
commit 1ac0f6c973
4 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
View File

@ -60,8 +60,8 @@ class SettingsActivity : SimpleActivity() {
updateMaterialActivityViews(binding.settingsCoordinator, binding.settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)
setupMaterialScrollListener(binding.settingsNestedScrollview, binding.settingsToolbar)
val settingsDeleteEventsFromDateHolder: RelativeLayout = findViewById(R.id.settings_delete_events_from_date_holder)
settingsDeleteEventsFromDateHolder.setOnClickListener {
val settingsDeleteEventsBeforeDateHolder: RelativeLayout = findViewById(R.id.settings_delete_events_before_date_holder)
settingsDeleteEventsBeforeDateHolder.setOnClickListener {
showDatePickerDialog()
}
}
@ -78,9 +78,7 @@ class SettingsActivity : SimpleActivity() {
val selectedDate = Calendar.getInstance()
selectedDate.set(year, month, day)
val chosenDateTimestamp = selectedDate.timeInMillis
setupDeleteEventsFromDate(chosenDateTimestamp)
setupDeleteEventsBeforeDate(chosenDateTimestamp)
},
year,
month,
@ -89,11 +87,6 @@ class SettingsActivity : SimpleActivity() {
datePickerDialog.show()
}
@RequiresApi(Build.VERSION_CODES.N)
override fun onResume() {
super.onResume()
@ -453,13 +446,10 @@ class SettingsActivity : SimpleActivity() {
}
@RequiresApi(Build.VERSION_CODES.N)
private fun setupDeleteEventsFromDate(chosenDateTimestamp: Long) = binding.apply {
Log.d("MyApp", "Deleting events after timestamp: $chosenDateTimestamp")
eventsHelper.deleteEventsFromDate(chosenDateTimestamp)
private fun setupDeleteEventsBeforeDate(chosenDateTimestamp: Long) = binding.apply {
eventsHelper.deleteEventsBeforeDate(chosenDateTimestamp)
}
private fun setupDisplayDescription() = binding.apply {
settingsDisplayDescription.isChecked = config.displayDescription
settingsReplaceDescriptionHolder.beVisibleIf(config.displayDescription)

5
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/EventsHelper.kt
View File

@ -259,14 +259,13 @@ class EventsHelper(val context: Context) {
}
}
fun deleteEventsFromDate(chosenDateTimestamp: Long) {
fun deleteEventsBeforeDate(chosenDateTimestamp: Long) {
ensureBackgroundThread {
val eventIds = eventsDB.getEventIdsWhereDate(chosenDateTimestamp).toMutableList()
val eventIds = eventsDB.getEventIdsBeforeDate(chosenDateTimestamp).toMutableList()
deleteEvents(eventIds, true)
}
}
fun deleteEvent(id: Long, deleteFromCalDAV: Boolean) = deleteEvents(arrayListOf(id), deleteFromCalDAV)
fun deleteEvents(ids: MutableList<Long>, deleteFromCalDAV: Boolean) {

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/interfaces/EventsDao.kt
View File

@ -136,8 +136,6 @@ interface EventsDao {
@Query("DELETE FROM events WHERE source = :source AND import_id = :importId")
fun deleteBirthdayAnniversary(source: String, importId: String): Int
@Query("SELECT id FROM events WHERE start_ts*1000 > :chosenDateTimestamp")
fun getEventIdsWhereDate(chosenDateTimestamp: Long): List<Long>
@Query("SELECT id FROM events WHERE start_ts*1000 < :chosenDateTimestamp")
fun getEventIdsBeforeDate(chosenDateTimestamp: Long): List<Long>
}

9
app/src/main/res/layout/activity_settings.xml
View File

@ -885,24 +885,21 @@
</RelativeLayout>
<RelativeLayout
android:id="@+id/settings_delete_events_from_date_holder"
android:id="@+id/settings_delete_events_before_date_holder"
style="@style/SettingsHolderTextViewOneLinerStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_delete_events_from_date"
android:id="@+id/settings_before_events_from_date"
style="@style/SettingsTextLabelStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Delete events and tasks after a specific date" />
android:text="Delete events and tasks before a specific date" />
</RelativeLayout>
<include
android:id="@+id/settings_events_divider"
layout="@layout/divider" />