From 8897c57a058ab6b7bce7defec5d679c55f651aa7 Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Sun, 26 Jan 2025 17:36:05 +0530 Subject: [PATCH 1/3] Remove old schema --- .../8.json | 357 ------------------ 1 file changed, 357 deletions(-) delete mode 100644 app/schemas/com.simplemobiletools.calendar.pro.databases.EventsDatabase/8.json diff --git a/app/schemas/com.simplemobiletools.calendar.pro.databases.EventsDatabase/8.json b/app/schemas/com.simplemobiletools.calendar.pro.databases.EventsDatabase/8.json deleted file mode 100644 index 254dd54aa..000000000 --- a/app/schemas/com.simplemobiletools.calendar.pro.databases.EventsDatabase/8.json +++ /dev/null @@ -1,357 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 8, - "identityHash": "1d5b2fddcb258e43f2935820863057a9", - "entities": [ - { - "tableName": "events", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `start_ts` INTEGER NOT NULL, `end_ts` INTEGER NOT NULL, `title` TEXT NOT NULL, `location` TEXT NOT NULL, `description` TEXT NOT NULL, `reminder_1_minutes` INTEGER NOT NULL, `reminder_2_minutes` INTEGER NOT NULL, `reminder_3_minutes` INTEGER NOT NULL, `reminder_1_type` INTEGER NOT NULL, `reminder_2_type` INTEGER NOT NULL, `reminder_3_type` INTEGER NOT NULL, `repeat_interval` INTEGER NOT NULL, `repeat_rule` INTEGER NOT NULL, `repeat_limit` INTEGER NOT NULL, `repetition_exceptions` TEXT NOT NULL, `attendees` TEXT NOT NULL, `import_id` TEXT NOT NULL, `time_zone` TEXT NOT NULL, `flags` INTEGER NOT NULL, `event_type` INTEGER NOT NULL, `parent_id` INTEGER NOT NULL, `last_updated` INTEGER NOT NULL, `source` TEXT NOT NULL, `availability` INTEGER NOT NULL, `color` INTEGER NOT NULL, `type` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "startTS", - "columnName": "start_ts", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "endTS", - "columnName": "end_ts", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "location", - "columnName": "location", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "reminder1Minutes", - "columnName": "reminder_1_minutes", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "reminder2Minutes", - "columnName": "reminder_2_minutes", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "reminder3Minutes", - "columnName": "reminder_3_minutes", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "reminder1Type", - "columnName": "reminder_1_type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "reminder2Type", - "columnName": "reminder_2_type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "reminder3Type", - "columnName": "reminder_3_type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "repeatInterval", - "columnName": "repeat_interval", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "repeatRule", - "columnName": "repeat_rule", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "repeatLimit", - "columnName": "repeat_limit", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "repetitionExceptions", - "columnName": "repetition_exceptions", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "attendees", - "columnName": "attendees", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "importId", - "columnName": "import_id", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "timeZone", - "columnName": "time_zone", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "flags", - "columnName": "flags", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "eventType", - "columnName": "event_type", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "parentId", - "columnName": "parent_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastUpdated", - "columnName": "last_updated", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "source", - "columnName": "source", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "availability", - "columnName": "availability", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "color", - "columnName": "color", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_events_id", - "unique": true, - "columnNames": [ - "id" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_events_id` ON `${TABLE_NAME}` (`id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "event_types", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT NOT NULL, `color` INTEGER NOT NULL, `caldav_calendar_id` INTEGER NOT NULL, `caldav_display_name` TEXT NOT NULL, `caldav_email` TEXT NOT NULL, `type` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "title", - "columnName": "title", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "color", - "columnName": "color", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "caldavCalendarId", - "columnName": "caldav_calendar_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "caldavDisplayName", - "columnName": "caldav_display_name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "caldavEmail", - "columnName": "caldav_email", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_event_types_id", - "unique": true, - "columnNames": [ - "id" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_event_types_id` ON `${TABLE_NAME}` (`id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "widgets", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `widget_id` INTEGER NOT NULL, `period` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "widgetId", - "columnName": "widget_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "period", - "columnName": "period", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_widgets_widget_id", - "unique": true, - "columnNames": [ - "widget_id" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_widgets_widget_id` ON `${TABLE_NAME}` (`widget_id`)" - } - ], - "foreignKeys": [] - }, - { - "tableName": "tasks", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `task_id` INTEGER NOT NULL, `start_ts` INTEGER NOT NULL, `flags` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": false - }, - { - "fieldPath": "task_id", - "columnName": "task_id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "startTS", - "columnName": "start_ts", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "flags", - "columnName": "flags", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_tasks_id_task_id", - "unique": true, - "columnNames": [ - "id", - "task_id" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_tasks_id_task_id` ON `${TABLE_NAME}` (`id`, `task_id`)" - } - ], - "foreignKeys": [] - } - ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1d5b2fddcb258e43f2935820863057a9')" - ] - } -} \ No newline at end of file From 4366e59f0325e21d15996a459a7c3ac7ed5eff14 Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Sun, 26 Jan 2025 18:06:26 +0530 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 14 ++++++++++++++ fastlane/metadata/android/en-US/changelogs/6.txt | 10 ++++++++++ 2 files changed, 24 insertions(+) create mode 100644 fastlane/metadata/android/en-US/changelogs/6.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c9800a70..9b880d959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ Changelog ========== +Version 1.2.0 *(2025-01-26)* +---------------------------- + +* Fixed issue with "Mark completed" notification button (#156) +* Fixed cut-off text in month view on some devices (#265) +* Fixed broken weekly repetition in some timezones (#408) +* Fixed "Mark completed" button color in black & white theme (#357) +* Fixed invisible attendee suggestions (#41) +* Added ability to export event colors in ICS files (#188) +* Added ability to quickly filter calendars on long press (#309) +* Added state-specific and optional holidays (#379, #413) +* Other minor bug fixes and improvements +* Added more translations + Version 1.1.0 *(2024-11-15)* ---------------------------- diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt new file mode 100644 index 000000000..e229ae520 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/6.txt @@ -0,0 +1,10 @@ +* Fixed issue with "Mark completed" notification button +* Fixed cut-off text in month view on some devices +* Fixed broken weekly repetition in some timezones +* Fixed 'Mark completed' button color in black & white theme +* Fixed invisible attendee suggestions +* Added ability to export event colors in ICS files +* Added ability to quickly filter calendars on long press +* Added state-specific and optional holidays +* Other minor bug fixes and improvements +* Added more translations From b704f43637ceaf99dd10c5341a00ed28d9a551ea Mon Sep 17 00:00:00 2001 From: Naveen Singh Date: Sun, 26 Jan 2025 18:07:45 +0530 Subject: [PATCH 3/3] Update app version to 1.2.0 (6) --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f893f88d1..cef8accfa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,8 +24,8 @@ app-build-javaVersion = "VERSION_17" app-build-kotlinJVMTarget = "17" #versioning app-version-appId = "org.fossify.calendar" -app-version-versionCode = "5" -app-version-versionName = "1.1.0" +app-version-versionCode = "6" +app-version-versionName = "1.2.0" [libraries] #Android X androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }