Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 02:39:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rework color selector and background.

Browse Source
This commit is contained in:
Alex Hart
2022-04-19 12:49:25 -03:00
parent 405d99fbe2
commit e2703b459f
3 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/text/TextStoryPostCreationState.kt
View File

@@ -4,6 +4,7 @@ import android.graphics.Color
import android.os.Parcelable
import androidx.annotation.ColorInt
import androidx.annotation.IntRange
import androidx.core.graphics.ColorUtils
import kotlinx.parcelize.IgnoredOnParcel
import kotlinx.parcelize.Parcelize
import org.thoughtcrime.securesms.conversation.colors.ChatColors
@@ -28,14 +29,27 @@ data class TextStoryPostCreationState(
val textForegroundColor: Int = when (textColorStyle) {
TextColorStyle.NO_BACKGROUND -> textColor
TextColorStyle.NORMAL -> textColor
TextColorStyle.INVERT -> Color.WHITE
TextColorStyle.INVERT -> getDefaultColorForLightness(textColor)
}
@ColorInt
@IgnoredOnParcel
val textBackgroundColor: Int = when (textColorStyle) {
TextColorStyle.NO_BACKGROUND -> Color.TRANSPARENT
TextColorStyle.NORMAL -> Color.WHITE
TextColorStyle.NORMAL -> getDefaultColorForLightness(textColor)
TextColorStyle.INVERT -> textColor
}
private fun getDefaultColorForLightness(textColor: Int): Int {
val hsl = floatArrayOf(0f, 0f, 0f)
ColorUtils.colorToHSL(textColor, hsl)
val lightness = hsl[2]
return if (lightness >= 0.9f) {
Color.BLACK
} else {
Color.WHITE
}
}
}