mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 08:39:22 +01:00
Move theme colors to core-ui.
This commit is contained in:
@@ -4,8 +4,8 @@ import android.animation.ValueAnimator
|
||||
import android.app.Activity
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.google.android.material.animation.ArgbEvaluatorCompat
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.util.WindowUtil
|
||||
import org.signal.core.ui.R as CoreUiR
|
||||
|
||||
/**
|
||||
* Controls status-bar color based off ability to scroll up
|
||||
@@ -16,8 +16,8 @@ class StatusBarColorAnimator(
|
||||
private var animator: ValueAnimator? = null
|
||||
private var previousCanScrollUp: Boolean = false
|
||||
|
||||
private val normalColor = ContextCompat.getColor(activity, R.color.signal_colorBackground)
|
||||
private val scrollColor = ContextCompat.getColor(activity, R.color.signal_colorSurface2)
|
||||
private val normalColor = ContextCompat.getColor(activity, CoreUiR.color.signal_colorBackground)
|
||||
private val scrollColor = ContextCompat.getColor(activity, CoreUiR.color.signal_colorSurface2)
|
||||
|
||||
fun setCanScrollUp(canScrollUp: Boolean) {
|
||||
if (previousCanScrollUp == canScrollUp) {
|
||||
|
||||
@@ -14,9 +14,9 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.unit.Velocity
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.google.android.material.animation.ArgbEvaluatorCompat
|
||||
import org.thoughtcrime.securesms.R
|
||||
import org.thoughtcrime.securesms.util.WindowUtil
|
||||
import kotlin.math.abs
|
||||
import org.signal.core.ui.R as CoreUiR
|
||||
|
||||
/**
|
||||
* Controls status-bar color based off a nested scroll
|
||||
@@ -30,8 +30,8 @@ class StatusBarColorNestedScrollConnection(
|
||||
|
||||
private var animator: ValueAnimator? = null
|
||||
|
||||
private val normalColor = ContextCompat.getColor(activity, R.color.signal_colorBackground)
|
||||
private val scrollColor = ContextCompat.getColor(activity, R.color.signal_colorSurface2)
|
||||
private val normalColor = ContextCompat.getColor(activity, CoreUiR.color.signal_colorBackground)
|
||||
private val scrollColor = ContextCompat.getColor(activity, CoreUiR.color.signal_colorSurface2)
|
||||
|
||||
private var contentOffset = 0f
|
||||
|
||||
|
||||
Reference in New Issue
Block a user