mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-16 03:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix bottom sheet accent colors in SC themes

Browse source
This commit is contained in:
SpiritCroc 2020-08-14 16:35:58 +02:00
parent 17430b06a2
commit 9f24356d92
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
View file

@ -20,7 +20,6 @@ import android.content.res.ColorStateList
import android.view.View
import android.widget.ImageView
import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.widget.ImageViewCompat
import com.airbnb.epoxy.EpoxyAttribute
import com.airbnb.epoxy.EpoxyModelClass
@ -31,6 +30,7 @@ import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
import im.vector.riotx.core.epoxy.onClick
import im.vector.riotx.core.extensions.setTextOrHide
import im.vector.riotx.core.resources.ColorProvider
import im.vector.riotx.core.resources.StringProvider
import im.vector.riotx.features.home.AvatarRenderer
import im.vector.riotx.features.themes.ThemeUtils
@ -69,7 +69,7 @@ abstract class BottomSheetRoomPreviewItem : VectorEpoxyModel<BottomSheetRoomPrev
if (isFavorite) {
holder.roomFavorite.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_favorite_remove)
holder.roomFavorite.setImageResource(R.drawable.ic_star_green_24dp)
tintColor = ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
tintColor = ColorProvider(holder.view.context).getColor(R.color.riotx_accent)
} else {
holder.roomFavorite.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_favorite_add)
holder.roomFavorite.setImageResource(R.drawable.ic_star_24dp)

9
vector/src/main/res/values/styles_sc.xml
View file

@ -42,6 +42,15 @@
<!-- Default color for text View -->
<item name="android:textColorTertiary">@color/text_color_tertiary_sc</item>
<item name="android:textColorLink">@color/riotx_links</item>
<!-- Accent color -->
<item name="android:colorAccent">@color/accent_sc</item>
<item name="colorAccent">@color/accent_sc</item>
</style>
<style name="Vector.BottomSheet.SC.Light" parent="Vector.BottomSheet.Light">
<!-- Accent color -->
<item name="android:colorAccent">@color/accent_sc</item>
<item name="colorAccent">@color/accent_sc</item>
</style>
<style name="VectorButtonStyleOutlined.SC">

2
vector/src/main/res/values/theme_sc_light.xml
View file

@ -48,6 +48,8 @@
<item name="riotx_positive_accent">@color/accent_sc</item>
<item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
</style>
<!-- Default AppTheme for usage where settings don't apply -->