ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-22 22:25:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2023-01-27 14:54:40 +04:00
parent 72fce11e2d
commit 01378dcb7e
7 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
submodules/TelegramUI/Components/AvatarEditorScreen/Sources/AvatarEditorScreen.swift
View File

@@ -652,9 +652,12 @@ final class AvatarEditorScreenComponent: Component {
updateScrollingToItemGroup: {
},
onScroll: { [weak self] in
if let self, let state = self.state, state.expanded {
state.expanded = false
state.updated(transition: Transition(animation: .curve(duration: 0.45, curve: .spring)))
if let self {
self.endEditing(true)
if let state = self.state, state.expanded {
state.expanded = false
state.updated(transition: Transition(animation: .curve(duration: 0.45, curve: .spring)))
}
}
},
chatPeerId: nil,
@@ -776,9 +779,12 @@ final class AvatarEditorScreenComponent: Component {
updateScrollingToItemGroup: {
},
onScroll: { [weak self] in
if let self, let state = self.state, state.expanded {
state.expanded = false
state.updated(transition: Transition(animation: .curve(duration: 0.45, curve: .spring)))
if let self {
self.endEditing(true)
if let state = self.state, state.expanded {
state.expanded = false
state.updated(transition: Transition(animation: .curve(duration: 0.45, curve: .spring)))
}
}
},
chatPeerId: nil,
@@ -1033,6 +1039,11 @@ final class AvatarEditorScreenComponent: Component {
transition.setAlpha(view: backgroundView, alpha: state.editingColor ? 0.0 : 1.0)
}
var colorPickerBottomInset: CGFloat = 0.0
if environment.deviceMetrics.type != .tablet {
colorPickerBottomInset = environment.safeInsets.bottom
}
let colorPickerSize = self.colorPickerView.update(
transition: transition,
component: AnyComponent(
@@ -1040,6 +1051,7 @@ final class AvatarEditorScreenComponent: Component {
theme: environment.theme,
strings: environment.strings,
isVisible: state.editingColor,
bottomInset: colorPickerBottomInset,
colors: state.selectedBackground.colors,
colorsChanged: { [weak state] colors in
if let state {
@@ -1066,7 +1078,7 @@ final class AvatarEditorScreenComponent: Component {
)
),
environment: {},
containerSize: CGSize(width: availableSize.width - sideInset * 2.0, height: .greatestFiniteMagnitude)
containerSize: CGSize(width: availableSize.width - sideInset * 2.0, height: availableSize.height)
)
let colorPickerFrame = CGRect(origin: .zero, size: colorPickerSize)
if let colorPickerView = self.colorPickerView.view {
@@ -1535,4 +1547,8 @@ public final class AvatarEditorScreen: ViewControllerComponentContainer {
override public func viewDidLoad() {
super.viewDidLoad()
}
public override func preferredContentSizeForLayout(_ layout: ContainerViewLayout) -> CGSize? {
return CGSize(width: 390.0, height: 730.0)
}
}