arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 08:10:58 +00:00
Code Issues Releases Wiki Activity

Fix loading tasklist color in edit collection activity.

Browse Source
This commit is contained in:
Tom Hacohen 2019-01-29 23:05:36 +00:00
parent 18a00716f8
commit 96fc87cad4
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/etesync/syncadapter/resource/LocalTaskList.kt
View File

@ -28,7 +28,7 @@ class LocalTaskList private constructor(
id: Long id: Long
): AndroidTaskList<LocalTask>(account, provider, LocalTask.Factory, id), LocalCollection<LocalTask> { ): AndroidTaskList<LocalTask>(account, provider, LocalTask.Factory, id), LocalCollection<LocalTask> {
companion object { companion object {
val defaultColor = -0x3c1592 // "DAVdroid green" val defaultColor = -0x743cb6 // light green 500
fun tasksProviderAvailable(context: Context): Boolean { fun tasksProviderAvailable(context: Context): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)

15
app/src/main/java/com/etesync/syncadapter/ui/EditCollectionActivity.kt
View File

@ -22,6 +22,7 @@ import com.etesync.syncadapter.R
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.model.JournalEntity import com.etesync.syncadapter.model.JournalEntity
import com.etesync.syncadapter.resource.LocalCalendar import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalTaskList
class EditCollectionActivity : CreateCollectionActivity() { class EditCollectionActivity : CreateCollectionActivity() {
@ -30,9 +31,17 @@ class EditCollectionActivity : CreateCollectionActivity() {
setTitle(R.string.edit_collection) setTitle(R.string.edit_collection)
if (info.type == CollectionInfo.Type.CALENDAR) { when (info.type) {
val colorSquare = findViewById<View>(R.id.color) CollectionInfo.Type.CALENDAR -> {
colorSquare.setBackgroundColor(info.color ?: LocalCalendar.defaultColor) val colorSquare = findViewById<View>(R.id.color)
colorSquare.setBackgroundColor(info.color ?: LocalCalendar.defaultColor)
}
CollectionInfo.Type.TASKS -> {
val colorSquare = findViewById<View>(R.id.color)
colorSquare.setBackgroundColor(info.color ?: LocalTaskList.defaultColor)
}
CollectionInfo.Type.ADDRESS_BOOK -> {
}
} }
val edit = findViewById<View>(R.id.display_name) as EditText val edit = findViewById<View>(R.id.display_name) as EditText