Merge branch 'master' into features/input-panel

This commit is contained in:
Ali
2022-06-21 09:54:14 +01:00
47 changed files with 607 additions and 197 deletions

View File

@@ -24,6 +24,7 @@ open class ViewControllerComponentContainer: ViewController {
public let statusBarHeight: CGFloat
public let navigationHeight: CGFloat
public let safeInsets: UIEdgeInsets
public let metrics: LayoutMetrics
public let isVisible: Bool
public let theme: PresentationTheme
public let strings: PresentationStrings
@@ -34,6 +35,7 @@ open class ViewControllerComponentContainer: ViewController {
statusBarHeight: CGFloat,
navigationHeight: CGFloat,
safeInsets: UIEdgeInsets,
metrics: LayoutMetrics,
isVisible: Bool,
theme: PresentationTheme,
strings: PresentationStrings,
@@ -43,6 +45,7 @@ open class ViewControllerComponentContainer: ViewController {
self.statusBarHeight = statusBarHeight
self.navigationHeight = navigationHeight
self.safeInsets = safeInsets
self.metrics = metrics
self.isVisible = isVisible
self.theme = theme
self.strings = strings
@@ -64,6 +67,9 @@ open class ViewControllerComponentContainer: ViewController {
if lhs.safeInsets != rhs.safeInsets {
return false
}
if lhs.metrics != rhs.metrics {
return false
}
if lhs.isVisible != rhs.isVisible {
return false
}
@@ -119,6 +125,7 @@ open class ViewControllerComponentContainer: ViewController {
statusBarHeight: layout.statusBarHeight ?? 0.0,
navigationHeight: navigationHeight,
safeInsets: UIEdgeInsets(top: layout.intrinsicInsets.top + layout.safeInsets.top, left: layout.safeInsets.left, bottom: layout.intrinsicInsets.bottom + layout.safeInsets.bottom, right: layout.safeInsets.right),
metrics: layout.metrics,
isVisible: self.currentIsVisible,
theme: self.theme ?? self.presentationData.theme,
strings: self.presentationData.strings,