signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Make unread filter icon turn blue when activated

Browse Source
This commit is contained in:
Adam Sharp 2024-10-30 13:34:33 -04:00
parent 9a25e5991a
commit 36246dc128
No known key found for this signature in database
2 changed files with 66 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Signal/Colors.xcassets/Signal/Background/secondaryUltramarineBackground.colorset/Contents.json Normal file
View File

@ -0,0 +1,29 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xFB",
"green" : "0xDD",
"red" : "0xC7"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

40
Signal/src/ViewControllers/HomeView/Chat List/ChatListFilterControl.swift
View File

@ -591,6 +591,7 @@ final class ChatListFilterControl: UIView, UIScrollViewDelegate {
return
}
let filterIconImageView = UIImageView(image: animationFrames.last!.image.withConfiguration(.filterIconDisappearing))
let transitionView = TransitionEffectView(effect: UIBlurEffect(style: .systemUltraThinMaterial))
let endFrame = clearButton.frame
@ -604,14 +605,19 @@ final class ChatListFilterControl: UIView, UIScrollViewDelegate {
clearButton.configuration?.background = .clear()
UIView.performWithoutAnimation {
imageContainer.alpha = 0
transitionView.contentView.backgroundColor = .filterIconActiveBackground
transitionView.frame = startFrame
transitionView.contentView.addSubview(filterIconImageView)
contentView.insertSubview(transitionView, belowSubview: imageContainer)
filterIconImageView.frame = transitionView.contentView.convert(imageViews.last!.frame, from: imageContainer)
}
let transitionAnimator = UIViewPropertyAnimator(duration: animationDuration(0.7), dampingRatio: 0.75)
transitionAnimator.addAnimations(withDurationFactor: 0.1) { [imageContainer] in
imageContainer.alpha = 0
transitionAnimator.addAnimations(withDurationFactor: 0.1) {
filterIconImageView.alpha = 0
}
transitionAnimator.addAnimations({ [clearButton] in
@ -619,7 +625,9 @@ final class ChatListFilterControl: UIView, UIScrollViewDelegate {
}, delayFactor: 0.33)
transitionAnimator.addAnimations {
transitionView.contentView.backgroundColor = .clear
transitionView.frame = endFrame
filterIconImageView.center = transitionView.contentView.bounds.center
}
transitionAnimator.addCompletion { [self] _ in
@ -648,7 +656,33 @@ private extension UIImage.Configuration {
}
static var filterIconFiltering: UIImage.SymbolConfiguration {
filterIconBase.applying(UIImage.SymbolConfiguration(paletteColors: [.Signal.ultramarine, .Signal.secondaryBackground]))
filterIconBase.applying(UIImage.SymbolConfiguration(paletteColors: [.filterIconActiveForeground, .filterIconActiveBackground]))
}
static var filterIconDisappearing: UIImage.SymbolConfiguration {
filterIconBase.applying(UIImage.SymbolConfiguration(paletteColors: [.filterIconActiveForeground, .clear]))
}
}
private extension UIColor {
static var filterIconActiveForeground: UIColor {
UIColor { traitCollection in
if traitCollection.userInterfaceStyle == .dark {
.Signal.label
} else {
.Signal.ultramarine
}
}
}
static var filterIconActiveBackground: UIColor {
UIColor { traitCollection in
if traitCollection.userInterfaceStyle == .dark {
.Signal.ultramarine
} else {
.Signal.secondaryUltramarineBackground
}
}
}
}