6543/BayernMessenger
1
0
Fork 0
forked from GitHub-Mirror/riotX-android
Code Issues 4 Pull Requests Releases Wiki Activity

Fix issue in theme

Browse Source
This commit is contained in:
Benoit Marty
2019-06-06 15:56:05 +02:00
parent e2d36aa213
commit dd563ec9ae
9 changed files with 37 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/riotredesign/features/home/room/list/UnreadCounterBadgeView.kt
View File

@ -20,6 +20,7 @@ import android.util.AttributeSet
import android.view.View
import androidx.appcompat.widget.AppCompatTextView
import im.vector.riotredesign.R
import im.vector.riotredesign.features.themes.ThemeUtils
class UnreadCounterBadgeView : AppCompatTextView {
@ -37,7 +38,7 @@ class UnreadCounterBadgeView : AppCompatTextView {
val bgRes = if (state.highlighted) {
R.drawable.bg_unread_highlight
} else {
R.drawable.bg_unread_notification
ThemeUtils.getResourceId(context, R.drawable.bg_unread_notification_light)
}
setBackgroundResource(bgRes)
text = RoomSummaryFormatter.formatUnreadMessagesCounter(state.count)

10
vector/src/main/java/im/vector/riotredesign/features/themes/ThemeUtils.kt
View File

@ -184,8 +184,9 @@ object ThemeUtils {
THEME_LIGHT_VALUE -> resourceId
THEME_DARK_VALUE -> {
return when (resourceId) {
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
else -> {
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_dark
else -> {
Timber.w("Warning, missing case for wanted drawable in dark theme")
resourceId
}
@ -193,8 +194,9 @@ object ThemeUtils {
}
THEME_BLACK_VALUE -> {
return when (resourceId) {
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_black
else -> {
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_black
R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_black
else -> {
Timber.w("Warning, missing case for wanted drawable in black theme")
resourceId
}