From b26b3186ac96d4050b368e34731ddecd12991ac7 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 2 Mar 2022 16:39:56 +0100 Subject: [PATCH] Hide username color override if unused Change-Id: I93e40b06c518398ad27458b6425ce0bcae8ebd57 --- .../roommemberprofile/RoomMemberProfileController.kt | 4 ++++ .../im/vector/app/features/settings/VectorPreferences.kt | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt index e15f308c70..c2e9909038 100644 --- a/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt +++ b/vector/src/main/java/im/vector/app/features/roommemberprofile/RoomMemberProfileController.kt @@ -24,6 +24,7 @@ import im.vector.app.core.epoxy.profiles.buildProfileSection import im.vector.app.core.resources.ColorProvider import im.vector.app.core.resources.StringProvider import im.vector.app.core.ui.list.genericFooterItem +import im.vector.app.features.settings.VectorPreferences import im.vector.lib.core.utils.epoxy.charsequence.toEpoxyCharSequence import org.matrix.android.sdk.api.session.Session import org.matrix.android.sdk.api.session.room.model.Membership @@ -34,6 +35,7 @@ import javax.inject.Inject class RoomMemberProfileController @Inject constructor( private val stringProvider: StringProvider, private val colorProvider: ColorProvider, + private val vectorPreferences: VectorPreferences, private val session: Session ) : TypedEpoxyController() { @@ -186,6 +188,7 @@ class RoomMemberProfileController @Inject constructor( // More buildProfileSection(stringProvider.getString(R.string.room_profile_section_more)) + if (vectorPreferences.canOverrideUserColors()) { buildProfileAction( id = "overrideColor", editable = false, @@ -194,6 +197,7 @@ class RoomMemberProfileController @Inject constructor( divider = !state.isMine, action = { callback?.onOverrideColorClicked() } ) + } if (!state.isMine) { val membership = state.asyncMembership() ?: return diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt index c601edc358..66e6671fd7 100755 --- a/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt @@ -1023,6 +1023,15 @@ class VectorPreferences @Inject constructor(private val context: Context, privat }, MatrixItemColorProvider.USER_COLORING_DEFAULT) ?: MatrixItemColorProvider.USER_COLORING_DEFAULT } + fun canOverrideUserColors(): Boolean { + return MatrixItemColorProvider.USER_COLORING_FROM_ID in listOf( + userColorMode(isDirect = false, isPublic = false), + userColorMode(isDirect = false, isPublic = true), + userColorMode(isDirect = true, isPublic = false), + userColorMode(isDirect = true, isPublic = true), + ) + } + // SC addition fun loadRoomAtFirstUnread(): Boolean { // https://github.com/vector-im/element-android/issues/5092