wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change code to resolve theme attributes

Browse source 
This way doesn't produce Lint errors.
This commit is contained in:
cketti 2020-03-10 21:57:34 +01:00
parent 33282c0895
commit 0ee6592b0b
3 changed files with 29 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app/ui/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
View file

@ -2,6 +2,7 @@ package com.fsck.k9.fragment
import android.content.Context
import android.content.res.Resources
import android.content.res.Resources.Theme
import android.graphics.Color
import android.graphics.Typeface
import android.graphics.drawable.Drawable
@ -26,11 +27,13 @@ import com.fsck.k9.ui.ContactBadge
import com.fsck.k9.ui.R
import com.fsck.k9.ui.messagelist.MessageListAppearance
import com.fsck.k9.ui.messagelist.MessageListItem
import com.fsck.k9.ui.resolveColorAttribute
import com.fsck.k9.ui.resolveDrawableAttribute
import kotlin.math.max
class MessageListAdapter internal constructor(
private val context: Context,
theme: Resources.Theme,
theme: Theme,
private val res: Resources,
private val layoutInflater: LayoutInflater,
private val contactsPictureLoader: ContactPictureLoader,
@ -38,41 +41,14 @@ class MessageListAdapter internal constructor(
private val appearance: MessageListAppearance
) : BaseAdapter() {
private val forwardedIcon: Drawable
private val answeredIcon: Drawable
private val forwardedAnsweredIcon: Drawable
private val previewTextColor: Int
private val activeItemBackgroundColor: Int
private val selectedItemBackgroundColor: Int
private val readItemBackgroundColor: Int
private val unreadItemBackgroundColor: Int
init {
val attributes = intArrayOf(
R.attr.messageListAnswered,
R.attr.messageListForwarded,
R.attr.messageListAnsweredForwarded,
R.attr.messageListPreviewTextColor,
R.attr.messageListActiveItemBackgroundColor,
R.attr.messageListSelectedBackgroundColor,
R.attr.messageListReadItemBackgroundColor,
R.attr.messageListUnreadItemBackgroundColor
)
val array = theme.obtainStyledAttributes(attributes)
answeredIcon = res.getDrawable(array.getResourceId(0, R.drawable.ic_messagelist_answered_dark))
forwardedIcon = res.getDrawable(array.getResourceId(1, R.drawable.ic_messagelist_forwarded_dark))
forwardedAnsweredIcon = res.getDrawable(array.getResourceId(2, R.drawable.ic_messagelist_answered_forwarded_dark))
previewTextColor = array.getColor(3, Color.BLACK)
activeItemBackgroundColor = array.getColor(4, Color.BLACK)
selectedItemBackgroundColor = array.getColor(5, Color.BLACK)
readItemBackgroundColor = array.getColor(6, Color.BLACK)
unreadItemBackgroundColor = array.getColor(7, Color.BLACK)
array.recycle()
}
private val forwardedIcon: Drawable = theme.resolveDrawableAttribute(R.attr.messageListForwarded)
private val answeredIcon: Drawable = theme.resolveDrawableAttribute(R.attr.messageListAnswered)
private val forwardedAnsweredIcon: Drawable = theme.resolveDrawableAttribute(R.attr.messageListAnsweredForwarded)
private val previewTextColor: Int = theme.resolveColorAttribute(R.attr.messageListPreviewTextColor)
private val activeItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListActiveItemBackgroundColor)
private val selectedItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListSelectedBackgroundColor)
private val readItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListReadItemBackgroundColor)
private val unreadItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListUnreadItemBackgroundColor)
var messages: List<MessageListItem> = emptyList()
set(value) {

18
app/ui/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt
View file

@ -1,15 +1,27 @@
package com.fsck.k9.ui
import android.content.res.Resources.Theme
import android.graphics.drawable.Drawable
import android.util.TypedValue
fun Theme.resolveAttribute(resId: Int): Int {
fun Theme.resolveColorAttribute(attrId: Int): Int {
val typedValue = TypedValue()
val found = resolveAttribute(resId, typedValue, true)
val found = resolveAttribute(attrId, typedValue, true)
if (!found) {
throw IllegalStateException("Couldn't resolve attribute ($resId)")
throw IllegalStateException("Couldn't resolve attribute ($attrId)")
}
return typedValue.data
}
fun Theme.resolveDrawableAttribute(attrId: Int): Drawable {
val typedValue = TypedValue()
val found = resolveAttribute(attrId, typedValue, true)
if (!found) {
throw IllegalStateException("Couldn't resolve attribute ($attrId)")
}
return getDrawable(typedValue.resourceId)
}

4
app/ui/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt
View file

@ -16,7 +16,7 @@ import com.fsck.k9.activity.K9Activity
import com.fsck.k9.ui.R
import com.fsck.k9.ui.fragmentTransaction
import com.fsck.k9.ui.fragmentTransactionWithBackStack
import com.fsck.k9.ui.resolveAttribute
import com.fsck.k9.ui.resolveColorAttribute
class GeneralSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback, SearchPreferenceResultListener {
private lateinit var searchPreferenceActionView: SearchPreferenceActionView
@ -63,7 +63,7 @@ class GeneralSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback, S
replace(R.id.generalSettingsContainer, fragment)
}
val accentColor = theme.resolveAttribute(R.attr.colorAccent)
val accentColor = theme.resolveColorAttribute(R.attr.colorAccent)
result.highlight(fragment as PreferenceFragmentCompat, accentColor)
}