Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 16:49:40 +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

27
app/src/main/java/org/thoughtcrime/securesms/scribbles/HSVColorSlider.kt
View File

@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.scribbles
import android.animation.FloatEvaluator
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.ColorFilter
@@ -15,6 +16,7 @@ import androidx.annotation.ColorInt
import androidx.annotation.Dimension
import androidx.appcompat.widget.AppCompatSeekBar
import androidx.core.graphics.ColorUtils
import org.thoughtcrime.securesms.scribbles.HSVColorSlider.toHue
import org.thoughtcrime.securesms.util.Util
import org.thoughtcrime.securesms.util.ViewUtil
import org.thoughtcrime.securesms.util.customizeOnDraw
@@ -30,16 +32,9 @@ object HSVColorSlider {
private const val WHITE_DIVISIONS = 125
private const val MAX_SEEK_DIVISIONS = COLOR_DIVISIONS + BLACK_DIVISIONS + WHITE_DIVISIONS
private const val STANDARD_LIGHTNESS = 0.4f
private val EVALUATOR = FloatEvaluator()
private val colors: IntArray = (0..COLOR_DIVISIONS).map { hue ->
ColorUtils.HSLToColor(
floatArrayOf(
hue.toHue(COLOR_DIVISIONS),
1f,
calculateLightness(hue.toFloat(), STANDARD_LIGHTNESS)
)
)
}.toIntArray() + (BLACK_DIVISIONS downTo 0).map { value ->
private val colors: IntArray = (0..BLACK_DIVISIONS).map { value ->
ColorUtils.HSLToColor(
floatArrayOf(
MAX_HUE.toFloat(),
@@ -47,12 +42,20 @@ object HSVColorSlider {
value / BLACK_DIVISIONS.toFloat() * STANDARD_LIGHTNESS
)
)
}.toIntArray() + (0..COLOR_DIVISIONS).map { hue ->
ColorUtils.HSLToColor(
floatArrayOf(
hue.toHue(COLOR_DIVISIONS),
1f,
calculateLightness(hue.toFloat(), STANDARD_LIGHTNESS)
)
)
}.toIntArray() + (0..WHITE_DIVISIONS).map { value ->
ColorUtils.HSLToColor(
floatArrayOf(
MAX_HUE.toFloat(),
0f,
value / WHITE_DIVISIONS.toFloat()
COLOR_DIVISIONS.toHue(COLOR_DIVISIONS),
1f,
EVALUATOR.evaluate(value / WHITE_DIVISIONS.toFloat(), calculateLightness(COLOR_DIVISIONS.toFloat(), STANDARD_LIGHTNESS), 1f)
)
)
}.toIntArray()