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

use the proper google event color when available

This commit is contained in:
tibbi 2017-07-18 20:19:10 +02:00
parent 30c82c6dc7
commit 58faeda4b3
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/kotlin/com/simplemobiletools/calendar/asynctasks/FetchGoogleEventsTask.kt
View File

@ -1,7 +1,9 @@
package com.simplemobiletools.calendar.asynctasks package com.simplemobiletools.calendar.asynctasks
import android.app.Activity import android.app.Activity
import android.graphics.Color
import android.os.AsyncTask import android.os.AsyncTask
import android.util.SparseIntArray
import com.google.api.client.extensions.android.http.AndroidHttp import com.google.api.client.extensions.android.http.AndroidHttp
import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
@ -34,6 +36,7 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
private var lastError: Exception? = null private var lastError: Exception? = null
private var dbHelper = activity.dbHelper private var dbHelper = activity.dbHelper
private var eventTypes = ArrayList<EventType>() private var eventTypes = ArrayList<EventType>()
private var eventColors = SparseIntArray()
init { init {
val transport = AndroidHttp.newCompatibleTransport() val transport = AndroidHttp.newCompatibleTransport()
@ -44,6 +47,7 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
override fun doInBackground(vararg params: Void): List<Event>? { override fun doInBackground(vararg params: Void): List<Event>? {
return try { return try {
getColors()
getDataFromApi() getDataFromApi()
} catch (e: Exception) { } catch (e: Exception) {
lastError = e lastError = e
@ -52,6 +56,13 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
} }
} }
private fun getColors() {
val colors = service.colors().get().execute()
for ((id, color) in colors.event.entries) {
eventColors.put(id.toInt(), Color.parseColor(color.background))
}
}
private fun getDataFromApi(): List<Event> { private fun getDataFromApi(): List<Event> {
val parsedEvents = ArrayList<Event>() val parsedEvents = ArrayList<Event>()
var currToken = "" var currToken = ""
@ -121,7 +132,7 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
val reminders = getReminders(googleEvent.reminders) val reminders = getReminders(googleEvent.reminders)
val repeatRule = getRepeatRule(googleEvent, startTS) val repeatRule = getRepeatRule(googleEvent, startTS)
val eventTypeId = getEventTypeId(googleEvent) val eventTypeId = getEventTypeId(googleEvent.colorId)
val event = Event(eventId, startTS, endTS, googleEvent.summary, googleEvent.description, reminders.getOrElse(0, { -1 }), val event = Event(eventId, startTS, endTS, googleEvent.summary, googleEvent.description, reminders.getOrElse(0, { -1 }),
reminders.getOrElse(1, { -1 }), reminders.getOrElse(2, { -1 }), repeatRule.repeatInterval, importId, flags, repeatRule.repeatLimit, reminders.getOrElse(1, { -1 }), reminders.getOrElse(2, { -1 }), repeatRule.repeatInterval, importId, flags, repeatRule.repeatLimit,
repeatRule.repeatRule, eventTypeId, lastUpdated = lastUpdate) repeatRule.repeatRule, eventTypeId, lastUpdated = lastUpdate)
@ -140,16 +151,17 @@ class FetchGoogleEventsTask(val activity: Activity, credential: GoogleAccountCre
return events return events
} }
private fun getEventTypeId(googleEvent: GoogleEvent): Int { private fun getEventTypeId(colorId: Int): Int {
var eventTypeId = -1 var eventTypeId = -1
val eventType = "google_sync_${googleEvent.colorId}" val eventType = "google_sync_$colorId"
eventTypes.forEach { eventTypes.forEach {
if (it.title.toLowerCase() == eventType) if (it.title.toLowerCase() == eventType)
eventTypeId = it.id eventTypeId = it.id
} }
if (eventTypeId == -1) { if (eventTypeId == -1) {
val newEventType = EventType(0, eventType, activity.config.primaryColor) val newColor = if (eventColors[colorId] != 0) eventColors[colorId] else activity.config.primaryColor
val newEventType = EventType(0, eventType, newColor)
eventTypeId = dbHelper.insertEventType(newEventType) eventTypeId = dbHelper.insertEventType(newEventType)
eventTypes.add(newEventType) eventTypes.add(newEventType)
} }