mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-06 03:33:41 +02:00
Adjust colors
This commit is contained in:
parent
602708649d
commit
f4f3ed1d54
4 changed files with 19 additions and 11 deletions
|
|
@ -567,7 +567,11 @@ public final class HorizontalTabsComponent: Component {
|
|||
guard let component = self.component, let layoutData = self.layoutData else {
|
||||
return
|
||||
}
|
||||
self.lensView.update(size: CGSize(width: layoutData.size.width - 3.0 * 2.0, height: layoutData.size.height - 3.0 * 2.0), selectionOrigin: CGPoint(x: -self.scrollView.contentOffset.x + layoutData.selectedItemFrame.minX, y: 0.0), selectionSize: CGSize(width: layoutData.selectedItemFrame.width, height: layoutData.size.height - 3.0 * 2.0), inset: 0.0, liftedInset: 6.0, isDark: component.theme.overallDarkAppearance, isLifted: self.temporaryLiftTimer != nil, transition: transition)
|
||||
var isLifted = self.temporaryLiftTimer != nil
|
||||
if component.theme.overallDarkAppearance {
|
||||
isLifted = false
|
||||
}
|
||||
self.lensView.update(size: CGSize(width: layoutData.size.width - 3.0 * 2.0, height: layoutData.size.height - 3.0 * 2.0), selectionOrigin: CGPoint(x: -self.scrollView.contentOffset.x + layoutData.selectedItemFrame.minX, y: 0.0), selectionSize: CGSize(width: layoutData.selectedItemFrame.width, height: layoutData.size.height - 3.0 * 2.0), inset: 0.0, liftedInset: 6.0, isDark: component.theme.overallDarkAppearance, isLifted: isLifted, transition: transition)
|
||||
|
||||
transition.setPosition(view: self.selectedScrollView, position: CGRect(origin: CGPoint(x: 3.0, y: 0.0), size: CGSize(width: layoutData.size.width - 3.0 * 2.0, height: layoutData.size.height - 3.0 * 2.0)).center)
|
||||
transition.setBounds(view: self.selectedScrollView, bounds: CGRect(origin: CGPoint(x: self.scrollView.contentOffset.x, y: 0.0), size: CGSize(width: layoutData.size.width - 3.0 * 2.0, height: layoutData.size.height - 3.0 * 2.0)))
|
||||
|
|
|
|||
|
|
@ -764,7 +764,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
|
|||
}
|
||||
|
||||
transition.updateFrame(view: searchEdgeEffectView, frame: searchEdgeEffectFrame)
|
||||
searchEdgeEffectView.update(content: presentationData.theme.list.blocksBackgroundColor, blur: true, rect: searchEdgeEffectFrame, edge: .top, edgeSize: searchEdgeEffectHeight, transition: searchEdgeEffectTransition)
|
||||
searchEdgeEffectView.update(content: presentationData.theme.list.plainBackgroundColor, blur: true, rect: searchEdgeEffectFrame, edge: .top, edgeSize: searchEdgeEffectHeight, transition: searchEdgeEffectTransition)
|
||||
} else if let searchEdgeEffectView = self.searchEdgeEffectView {
|
||||
self.searchEdgeEffectView = nil
|
||||
transition.updateAlpha(layer: searchEdgeEffectView.layer, alpha: 0.0, completion: { [weak searchEdgeEffectView] _ in
|
||||
|
|
@ -2555,7 +2555,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
|
|||
self.updateUnderHeaderContentsAlpha?(1.0 - realAreaExpansionFraction, transition)
|
||||
}
|
||||
|
||||
self.headerEdgeEffectView.update(content: presentationData.theme.rootController.navigationBar.opaqueBackgroundColor, blur: true, rect: edgeEffectFrame, edge: .top, edgeSize: edgeEffectHeight, transition: ComponentTransition(transition))
|
||||
self.headerEdgeEffectView.update(content: presentationData.theme.list.plainBackgroundColor, blur: true, rect: edgeEffectFrame, edge: .top, edgeSize: edgeEffectHeight, transition: ComponentTransition(transition))
|
||||
|
||||
navigationTransition.updateAlpha(layer: self.headerEdgeEffectView.layer, alpha: state.isEditing ? 0.0 : 1.0)
|
||||
|
||||
|
|
|
|||
|
|
@ -12604,6 +12604,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
|
|||
let headerInset = sectionInset
|
||||
|
||||
let headerHeight = self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: headerInset, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: navigationHeight, isModalOverlay: layout.isModalOverlay, isMediaOnly: self.isMediaOnly, contentOffset: self.isMediaOnly ? 212.0 : self.scrollNode.view.contentOffset.y, paneContainerY: self.paneContainerNode.frame.minY, presentationData: self.presentationData, peer: self.data?.savedMessagesPeer ?? self.data?.peer, cachedData: self.data?.cachedData, threadData: self.data?.threadData, peerNotificationSettings: self.data?.peerNotificationSettings, threadNotificationSettings: self.data?.threadNotificationSettings, globalNotificationSettings: self.data?.globalNotificationSettings, statusData: self.data?.status, panelStatusData: self.customStatusData, isSecretChat: self.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.data?.isContact ?? false, isSettings: self.isSettings, state: self.state, profileGiftsContext: self.data?.profileGiftsContext, screenData: self.data, isSearching: self.searchDisplayController != nil, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, transition: self.headerNode.navigationTransition == nil ? transition : .immediate, additive: additive, animateHeader: transition.isAnimated && self.headerNode.navigationTransition == nil)
|
||||
|
||||
let headerFrame = CGRect(origin: CGPoint(x: 0.0, y: contentHeight), size: CGSize(width: layout.size.width, height: layout.size.height))
|
||||
if additive {
|
||||
transition.updateFrameAdditive(node: self.headerNode, frame: headerFrame)
|
||||
|
|
|
|||
|
|
@ -4594,12 +4594,13 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
|
|||
} else {
|
||||
backgroundColor = presentationData.theme.list.blocksBackgroundColor
|
||||
}
|
||||
let _ = backgroundColor
|
||||
|
||||
if self.didUpdateItemsOnce {
|
||||
/*if self.didUpdateItemsOnce {
|
||||
ComponentTransition(animation: .curve(duration: 0.2, curve: .easeInOut)).setBackgroundColor(view: self.view, color: backgroundColor)
|
||||
} else {
|
||||
self.view.backgroundColor = backgroundColor
|
||||
}
|
||||
}*/
|
||||
} else {
|
||||
let emptyStateView: ComponentView<Empty>
|
||||
var emptyStateTransition = ComponentTransition(transition)
|
||||
|
|
@ -4661,12 +4662,13 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
|
|||
} else {
|
||||
backgroundColor = presentationData.theme.list.blocksBackgroundColor
|
||||
}
|
||||
let _ = backgroundColor
|
||||
|
||||
if self.didUpdateItemsOnce {
|
||||
/*if self.didUpdateItemsOnce {
|
||||
ComponentTransition(animation: .curve(duration: 0.2, curve: .easeInOut)).setBackgroundColor(view: self.view, color: backgroundColor)
|
||||
} else {
|
||||
self.view.backgroundColor = backgroundColor
|
||||
}
|
||||
}*/
|
||||
}
|
||||
} else if case .botPreview = self.scope, let items = self.items, items.items.isEmpty, items.count == 0 {
|
||||
let emptyStateView: ComponentView<Empty>
|
||||
|
|
@ -4827,12 +4829,13 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
|
|||
} else {
|
||||
backgroundColor = presentationData.theme.list.blocksBackgroundColor
|
||||
}
|
||||
let _ = backgroundColor
|
||||
|
||||
if self.didUpdateItemsOnce {
|
||||
/*if self.didUpdateItemsOnce {
|
||||
ComponentTransition(animation: .curve(duration: 0.2, curve: .easeInOut)).setBackgroundColor(view: self.view, color: backgroundColor)
|
||||
} else {
|
||||
self.view.backgroundColor = backgroundColor
|
||||
}
|
||||
}*/
|
||||
} else {
|
||||
if let emptyStateView = self.emptyStateView {
|
||||
let subTransition = ComponentTransition(animation: .curve(duration: 0.2, curve: .easeInOut))
|
||||
|
|
@ -4858,7 +4861,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
|
|||
subTransition.setBackgroundColor(view: self.view, color: presentationData.theme.list.blocksBackgroundColor)
|
||||
}
|
||||
} else {
|
||||
if self.isProfileEmbedded, case .botPreview = self.scope {
|
||||
/*if self.isProfileEmbedded, case .botPreview = self.scope {
|
||||
self.view.backgroundColor = presentationData.theme.list.blocksBackgroundColor
|
||||
} else if self.isProfileEmbedded, case let .peer(_, _, isArchived) = self.scope, self.canManageStories, self.isProfileEmbedded, !isArchived {
|
||||
self.view.backgroundColor = presentationData.theme.list.blocksBackgroundColor
|
||||
|
|
@ -4868,7 +4871,7 @@ public final class PeerInfoStoryPaneNode: ASDisplayNode, PeerInfoPaneNode, ASScr
|
|||
} else {
|
||||
self.view.backgroundColor = .clear
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue