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

Merge pull request #2004 from Naveen3Singh/allow_sharing_tasks 

Allow sharing tasks
This commit is contained in:
Tibor Kaputa 2023-03-11 22:46:57 +01:00 committed by GitHub
parent a9e7f9c6d0 68e7c627b9
commit 1ab3167fab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/TaskActivity.kt
View File

@ -91,6 +91,7 @@ class TaskActivity : SimpleActivity() {
if (::mTask.isInitialized) {
task_toolbar.menu.apply {
findItem(R.id.delete).isVisible = mTask.id != null
findItem(R.id.share).isVisible = mTask.id != null
findItem(R.id.duplicate).isVisible = mTask.id != null
}
}
@ -102,6 +103,7 @@ class TaskActivity : SimpleActivity() {
R.id.save -> saveCurrentTask()
R.id.delete -> deleteTask()
R.id.duplicate -> duplicateTask()
R.id.share -> shareTask()
else -> return@setOnMenuItemClickListener false
}
return@setOnMenuItemClickListener true
@ -502,6 +504,10 @@ class TaskActivity : SimpleActivity() {
}
}
private fun shareTask() {
shareEvents(arrayListOf(mTask.id!!))
}
private fun deleteTask() {
if (mTask.id == null) {
return

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Activity.kt
View File

@ -22,7 +22,7 @@ fun BaseSimpleActivity.shareEvents(ids: List<Long>) {
return@ensureBackgroundThread
}
val events = eventsDB.getEventsWithIds(ids) as ArrayList<Event>
val events = eventsDB.getEventsOrTasksWithIds(ids) as ArrayList<Event>
if (events.isEmpty()) {
toast(R.string.no_items_found)
}

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

@ -81,8 +81,8 @@ interface EventsDao {
@Query("SELECT * FROM events WHERE source = :source AND type = $TYPE_EVENT")
fun getEventsFromCalDAVCalendar(source: String): List<Event>
@Query("SELECT * FROM events WHERE id IN (:ids) AND type = $TYPE_EVENT")
fun getEventsWithIds(ids: List<Long>): List<Event>
@Query("SELECT * FROM events WHERE id IN (:ids)")
fun getEventsOrTasksWithIds(ids: List<Long>): List<Event>
//val selection = "$COL_REMINDER_MINUTES != -1 AND ($COL_START_TS > ? OR $COL_REPEAT_INTERVAL != 0) AND $COL_START_TS != 0"
@Query("SELECT * FROM events WHERE reminder_1_minutes != -1 AND (start_ts > :currentTS OR repeat_interval != 0) AND start_ts != 0")

5
app/src/main/res/menu/menu_task.xml
View File

@ -16,4 +16,9 @@
android:icon="@drawable/ic_copy_vector"
android:title="@string/duplicate_task"
app:showAsAction="always" />
<item
android:id="@+id/share"
android:icon="@drawable/ic_share_vector"
android:title="@string/share"
app:showAsAction="ifRoom" />
</menu>