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

Move theme colors to core-ui.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-01-29 16:44:11 -05:00
parent d0d32c8f33
commit 5c50372021
91 changed files with 268 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/thoughtcrime/securesms/util/Material3OnScrollHelper.kt
View File

@@ -12,8 +12,8 @@ import androidx.lifecycle.LifecycleOwner
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.animation.ArgbEvaluatorCompat
import com.google.android.material.appbar.AppBarLayout
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.util.views.Stub
import org.signal.core.ui.R as CoreUiR
/**
* Sets the view's isActivated state when the content of the attached recycler can scroll up.
@@ -42,14 +42,14 @@ open class Material3OnScrollHelper(
}
open val activeColorSet: ColorSet = ColorSet(
toolbarColorRes = R.color.signal_colorSurface2,
statusBarColorRes = R.color.signal_colorSurface2,
chatFolderColorRes = R.color.signal_colorBackground
toolbarColorRes = CoreUiR.color.signal_colorSurface2,
statusBarColorRes = CoreUiR.color.signal_colorSurface2,
chatFolderColorRes = CoreUiR.color.signal_colorBackground
)
open val inactiveColorSet: ColorSet = ColorSet(
toolbarColorRes = R.color.signal_colorBackground,
statusBarColorRes = R.color.signal_colorBackground,
chatFolderColorRes = R.color.signal_colorSurface2
toolbarColorRes = CoreUiR.color.signal_colorBackground,
statusBarColorRes = CoreUiR.color.signal_colorBackground,
chatFolderColorRes = CoreUiR.color.signal_colorSurface2
)
protected var previousStatusBarColor: Int = getStatusBarColor()

2
app/src/main/java/org/thoughtcrime/securesms/util/views/LearnMoreTextView.java
View File

@@ -46,7 +46,7 @@ public class LearnMoreTextView extends AppCompatTextView {
private void init() {
setMovementMethod(LinkMovementMethod.getInstance());
setLinkTextInternal(R.string.LearnMoreTextView_learn_more);
setLinkColor(ContextCompat.getColor(getContext(), R.color.signal_colorOnSurface));
setLinkColor(ContextCompat.getColor(getContext(), org.signal.core.ui.R.color.signal_colorOnSurface));
visible = true;
}