From a023b5ce6ff0955479cabe8b8d6df1b99967abe1 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 20 Jan 2020 23:23:12 +0100 Subject: [PATCH] use proper colors at the SpeedDial activity --- .../pro/activities/ManageSpeedDialActivity.kt | 3 +++ .../contacts/pro/adapters/SpeedDialAdapter.kt | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt index 25b87c4d..ca1a3a9c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt @@ -2,6 +2,7 @@ package com.simplemobiletools.contacts.pro.activities import android.os.Bundle import com.google.gson.Gson +import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.adapters.SpeedDialAdapter import com.simplemobiletools.contacts.pro.dialogs.SelectContactsDialog @@ -25,6 +26,8 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener { ContactsHelper(this).getContacts { contacts -> allContacts = contacts } + + updateTextColors(manage_speed_dial_scrollview) } override fun onStop() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt index a3fa7e2e..78e2fbfb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt @@ -67,10 +67,14 @@ class SpeedDialAdapter(activity: SimpleActivity, var speedDialValues: ArrayList< private fun setupView(view: View, speedDial: SpeedDial) { view.apply { - var text = "${speedDial.id}. " - text += if (speedDial.isValid()) speedDial.displayName else "" - speed_dial_label.text = text - speed_dial_label.isSelected = selectedKeys.contains(speedDial.hashCode()) + var displayName = "${speedDial.id}. " + displayName += if (speedDial.isValid()) speedDial.displayName else "" + + speed_dial_label.apply { + text = displayName + isSelected = selectedKeys.contains(speedDial.hashCode()) + setTextColor(textColor) + } } } }