feat: rename "Regular event" to "Local calendar" (#941)

naveensingh · web-flow · commit 8e97b2cc5be0 · 2025-12-14T19:16:58.000+05:30
* feat: rename "Regular event" to "Local calendar"

* docs: update changelog

* style: shorten line

* docs: update changelog

* feat: rephrase `cannot_delete_default_type` slightly
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 ### Changed
 - Replaced "event types" concept with "calendars" ([#629])
+- Renamed built-in "Regular event" calendar to "Local calendar"
 - Weekday labels now use three-letter abbreviations instead of single letters ([#103])
 - Converting all-day events to timed events now respects the default start time and duration ([#917])
 
diff --git a/app/src/main/kotlin/org/fossify/calendar/activities/EventActivity.kt b/app/src/main/kotlin/org/fossify/calendar/activities/EventActivity.kt
@@ -83,7 +83,7 @@ import org.fossify.calendar.helpers.NEW_EVENT_SET_HOUR_DURATION
 import org.fossify.calendar.helpers.NEW_EVENT_START_TS
 import org.fossify.calendar.helpers.ORIGINAL_END_TS
 import org.fossify.calendar.helpers.ORIGINAL_START_TS
-import org.fossify.calendar.helpers.REGULAR_EVENT_TYPE_ID
+import org.fossify.calendar.helpers.LOCAL_CALENDAR_ID
 import org.fossify.calendar.helpers.REMINDER_1_MINUTES
 import org.fossify.calendar.helpers.REMINDER_1_TYPE
 import org.fossify.calendar.helpers.REMINDER_2_MINUTES
@@ -186,7 +186,7 @@ class EventActivity : SimpleActivity() {
     private var mRepeatInterval = 0
     private var mRepeatLimit = 0L
     private var mRepeatRule = 0
-    private var mEventTypeId = REGULAR_EVENT_TYPE_ID
+    private var mEventTypeId = LOCAL_CALENDAR_ID
     private var mEventOccurrenceTS = 0L
     private var mLastSavePromptTS = 0L
     private var mEventCalendarId = STORED_LOCALLY_ONLY
@@ -406,7 +406,7 @@ class EventActivity : SimpleActivity() {
         event: Event?,
     ) = binding.apply {
         if (localEventType == null || localEventType.caldavCalendarId != 0) {
-            config.lastUsedLocalEventTypeId = REGULAR_EVENT_TYPE_ID
+            config.lastUsedLocalEventTypeId = LOCAL_CALENDAR_ID
         }
 
         mEventTypeId = if (config.defaultEventTypeId == -1L) {
diff --git a/app/src/main/kotlin/org/fossify/calendar/activities/TaskActivity.kt b/app/src/main/kotlin/org/fossify/calendar/activities/TaskActivity.kt
@@ -26,7 +26,7 @@ import org.fossify.commons.models.RadioItem
 import org.joda.time.DateTime
 
 class TaskActivity : SimpleActivity() {
-    private var mEventTypeId = REGULAR_EVENT_TYPE_ID
+    private var mEventTypeId = LOCAL_CALENDAR_ID
     private lateinit var mTaskDateTime: DateTime
     private lateinit var mTask: Event
 
@@ -237,7 +237,7 @@ class TaskActivity : SimpleActivity() {
 
     private fun gotTask(savedInstanceState: Bundle?, localEventType: EventType?, task: Event?) {
         if (localEventType == null) {
-            config.lastUsedLocalEventTypeId = REGULAR_EVENT_TYPE_ID
+            config.lastUsedLocalEventTypeId = LOCAL_CALENDAR_ID
         }
 
         mEventTypeId = if (config.defaultEventTypeId == -1L) config.lastUsedLocalEventTypeId else config.defaultEventTypeId
diff --git a/app/src/main/kotlin/org/fossify/calendar/adapters/ManageEventTypesAdapter.kt b/app/src/main/kotlin/org/fossify/calendar/adapters/ManageEventTypesAdapter.kt
@@ -6,7 +6,7 @@ import org.fossify.calendar.R
 import org.fossify.calendar.activities.SimpleActivity
 import org.fossify.calendar.databinding.ItemEventTypeBinding
 import org.fossify.calendar.extensions.eventsHelper
-import org.fossify.calendar.helpers.REGULAR_EVENT_TYPE_ID
+import org.fossify.calendar.helpers.LOCAL_CALENDAR_ID
 import org.fossify.calendar.interfaces.DeleteEventTypesListener
 import org.fossify.calendar.models.EventType
 import org.fossify.commons.adapters.MyRecyclerViewAdapter
@@ -163,7 +163,7 @@ class ManageEventTypesAdapter(
 
         for (key in selectedKeys) {
             val type = getItemWithKey(key) ?: continue
-            if (type.id == REGULAR_EVENT_TYPE_ID) {
+            if (type.id == LOCAL_CALENDAR_ID) {
                 activity.toast(R.string.cannot_delete_default_type)
                 eventTypesToDelete.remove(type)
                 toggleItemSelection(false, getItemKeyPosition(type.id!!.toInt()))
diff --git a/app/src/main/kotlin/org/fossify/calendar/databases/EventsDatabase.kt b/app/src/main/kotlin/org/fossify/calendar/databases/EventsDatabase.kt
@@ -10,7 +10,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import org.fossify.calendar.R
 import org.fossify.calendar.extensions.config
 import org.fossify.calendar.helpers.Converters
-import org.fossify.calendar.helpers.REGULAR_EVENT_TYPE_ID
+import org.fossify.calendar.helpers.LOCAL_CALENDAR_ID
 import org.fossify.calendar.interfaces.EventTypesDao
 import org.fossify.calendar.interfaces.EventsDao
 import org.fossify.calendar.interfaces.TasksDao
@@ -45,7 +45,7 @@ abstract class EventsDatabase : RoomDatabase() {
                             .addCallback(object : Callback() {
                                 override fun onCreate(db: SupportSQLiteDatabase) {
                                     super.onCreate(db)
-                                    insertRegularEventType(context)
+                                    insertLocalCalendar(context)
                                 }
                             })
                             .addMigrations(MIGRATION_1_2)
@@ -70,12 +70,15 @@ abstract class EventsDatabase : RoomDatabase() {
             db = null
         }
 
-        private fun insertRegularEventType(context: Context) {
+        private fun insertLocalCalendar(context: Context) {
             Executors.newSingleThreadScheduledExecutor().execute {
-                val regularEvent = context.resources.getString(R.string.regular_event)
-                val eventType = EventType(REGULAR_EVENT_TYPE_ID, regularEvent, context.getProperPrimaryColor())
+                val eventType = EventType(
+                    id = LOCAL_CALENDAR_ID,
+                    title = context.resources.getString(R.string.regular_event),
+                    color = context.getProperPrimaryColor()
+                )
                 db!!.EventTypesDao().insertOrUpdate(eventType)
-                context.config.addDisplayEventType(REGULAR_EVENT_TYPE_ID.toString())
+                context.config.addDisplayEventType(LOCAL_CALENDAR_ID.toString())
             }
         }
 
diff --git a/app/src/main/kotlin/org/fossify/calendar/dialogs/ImportEventsDialog.kt b/app/src/main/kotlin/org/fossify/calendar/dialogs/ImportEventsDialog.kt
@@ -12,20 +12,20 @@ import org.fossify.calendar.helpers.IcsImporter.ImportResult.IMPORT_FAIL
 import org.fossify.calendar.helpers.IcsImporter.ImportResult.IMPORT_NOTHING_NEW
 import org.fossify.calendar.helpers.IcsImporter.ImportResult.IMPORT_OK
 import org.fossify.calendar.helpers.IcsImporter.ImportResult.IMPORT_PARTIAL
-import org.fossify.calendar.helpers.REGULAR_EVENT_TYPE_ID
+import org.fossify.calendar.helpers.LOCAL_CALENDAR_ID
 import org.fossify.commons.extensions.*
 import org.fossify.commons.helpers.ensureBackgroundThread
 
 class ImportEventsDialog(val activity: SimpleActivity, val path: String, val callback: (refreshView: Boolean) -> Unit) {
-    private var currEventTypeId = REGULAR_EVENT_TYPE_ID
+    private var currEventTypeId = LOCAL_CALENDAR_ID
     private var currEventTypeCalDAVCalendarId = 0
     private val config = activity.config
     private val binding by activity.viewBinding(DialogImportEventsBinding::inflate)
 
     init {
         ensureBackgroundThread {
             if (activity.eventTypesDB.getEventTypeWithId(config.lastUsedLocalEventTypeId) == null) {
-                config.lastUsedLocalEventTypeId = REGULAR_EVENT_TYPE_ID
+                config.lastUsedLocalEventTypeId = LOCAL_CALENDAR_ID
             }
 
             val isLastCaldavCalendarOK = config.caldavSync && config.getSyncedCalendarIdsAsList().contains(config.lastUsedCaldavCalendarId)
@@ -35,7 +35,7 @@ class ImportEventsDialog(val activity: SimpleActivity, val path: String, val cal
                     currEventTypeCalDAVCalendarId = config.lastUsedCaldavCalendarId
                     lastUsedCalDAVCalendar.id!!
                 } else {
-                    REGULAR_EVENT_TYPE_ID
+                    LOCAL_CALENDAR_ID
                 }
             } else {
                 config.lastUsedLocalEventTypeId
diff --git a/app/src/main/kotlin/org/fossify/calendar/helpers/Config.kt b/app/src/main/kotlin/org/fossify/calendar/helpers/Config.kt
@@ -114,7 +114,7 @@ class Config(context: Context) : BaseConfig(context) {
         set(calendarId) = prefs.edit().putInt(LAST_USED_CALDAV_CALENDAR, calendarId).apply()
 
     var lastUsedLocalEventTypeId: Long
-        get() = prefs.getLong(LAST_USED_LOCAL_EVENT_TYPE_ID, REGULAR_EVENT_TYPE_ID)
+        get() = prefs.getLong(LAST_USED_LOCAL_EVENT_TYPE_ID, LOCAL_CALENDAR_ID)
         set(lastUsedLocalEventTypeId) = prefs.edit().putLong(LAST_USED_LOCAL_EVENT_TYPE_ID, lastUsedLocalEventTypeId).apply()
 
     var lastUsedIgnoreEventTypesState: Boolean
diff --git a/app/src/main/kotlin/org/fossify/calendar/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/calendar/helpers/Constants.kt
@@ -39,7 +39,7 @@ const val CALDAV = "Caldav"
 const val VIEW_TO_OPEN = "view_to_open"
 const val SHORTCUT_NEW_EVENT = "shortcut_new_event"
 const val SHORTCUT_NEW_TASK = "shortcut_new_task"
-const val REGULAR_EVENT_TYPE_ID = 1L
+const val LOCAL_CALENDAR_ID = 1L
 const val TIME_ZONE = "time_zone"
 const val CURRENT_TIME_ZONE = "current_time_zone"
 const val IS_TASK = "is_task"
diff --git a/app/src/main/kotlin/org/fossify/calendar/helpers/EventsHelper.kt b/app/src/main/kotlin/org/fossify/calendar/helpers/EventsHelper.kt
@@ -87,7 +87,10 @@ class EventsHelper(val context: Context) {
     fun getEventTypeWithCalDAVCalendarId(calendarId: Int) = eventTypesDB.getEventTypeWithCalDAVCalendarId(calendarId)
 
     fun deleteEventTypes(eventTypes: ArrayList<EventType>, deleteEvents: Boolean) {
-        val typesToDelete = eventTypes.asSequence().filter { it.caldavCalendarId == 0 && it.id != REGULAR_EVENT_TYPE_ID }.toMutableList()
+        val typesToDelete = eventTypes
+            .asSequence()
+            .filter { it.caldavCalendarId == 0 && it.id != LOCAL_CALENDAR_ID }
+            .toMutableList()
         val deleteIds = typesToDelete.map { it.id }.toMutableList()
         val deletedSet = deleteIds.map { it.toString() }.toHashSet()
         config.removeDisplayEventTypes(deletedSet)
diff --git a/app/src/main/kotlin/org/fossify/calendar/helpers/IcsImporter.kt b/app/src/main/kotlin/org/fossify/calendar/helpers/IcsImporter.kt
@@ -43,7 +43,7 @@ class IcsImporter(val activity: SimpleActivity) {
     private var curRepeatInterval = 0
     private var curRepeatLimit = 0L
     private var curRepeatRule = 0
-    private var curEventTypeId = REGULAR_EVENT_TYPE_ID
+    private var curEventTypeId = LOCAL_CALENDAR_ID
     private var curLastModified = 0L
     private var curCategoryColor = -2
     private var curAvailability = Events.AVAILABILITY_BUSY
@@ -496,7 +496,7 @@ class IcsImporter(val activity: SimpleActivity) {
         curRepeatInterval = 0
         curRepeatLimit = 0L
         curRepeatRule = 0
-        curEventTypeId = REGULAR_EVENT_TYPE_ID
+        curEventTypeId = LOCAL_CALENDAR_ID
         curLastModified = 0L
         curCategoryColor = -2
         isNotificationDescription = false
diff --git a/app/src/main/kotlin/org/fossify/calendar/interfaces/EventsDao.kt b/app/src/main/kotlin/org/fossify/calendar/interfaces/EventsDao.kt
@@ -109,7 +109,7 @@ interface EventsDao {
     @Query("SELECT id FROM events WHERE source = :source AND import_id != \"\" AND type = $TYPE_EVENT")
     fun getCalDAVCalendarEvents(source: String): List<Long>
 
-    @Query("UPDATE events SET event_type = $REGULAR_EVENT_TYPE_ID WHERE event_type = :eventTypeId")
+    @Query("UPDATE events SET event_type = $LOCAL_CALENDAR_ID WHERE event_type = :eventTypeId")
     fun resetEventsAndTasksWithType(eventTypeId: Long)
 
     @Query("UPDATE events SET import_id = :importId, source = :source WHERE id = :id AND type = $TYPE_EVENT")
diff --git a/app/src/main/kotlin/org/fossify/calendar/models/Event.kt b/app/src/main/kotlin/org/fossify/calendar/models/Event.kt
@@ -38,7 +38,7 @@ data class Event(
     @ColumnInfo(name = "import_id") var importId: String = "",
     @ColumnInfo(name = "time_zone") var timeZone: String = "",
     @ColumnInfo(name = "flags") var flags: Int = 0,
-    @ColumnInfo(name = "event_type") var eventType: Long = REGULAR_EVENT_TYPE_ID,
+    @ColumnInfo(name = "event_type") var eventType: Long = LOCAL_CALENDAR_ID,
     @ColumnInfo(name = "parent_id") var parentId: Long = 0,
     @ColumnInfo(name = "last_updated") var lastUpdated: Long = 0L,
     @ColumnInfo(name = "source") var source: String = SOURCE_SIMPLE_CALENDAR,
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -161,8 +161,8 @@
     <string name="edit_type">Edit calendar</string>
     <string name="type_already_exists">Calendar with this title already exists</string>
     <string name="color">Color</string>
-    <string name="regular_event">Regular event</string>
-    <string name="cannot_delete_default_type">Default calendar cannot be deleted</string>
+    <string name="regular_event">Local calendar</string>
+    <string name="cannot_delete_default_type">Built-in calendar cannot be deleted</string>
     <string name="select_event_type">Select a calendar</string>
     <string name="move_events_into_default">Move affected events into the default calendar</string>
     <string name="remove_affected_events">Permanently remove affected events</string>
