ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-09-06 04:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Camera and editor improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-06-27 23:31:50 +02:00
parent c1120648db
commit dead829cd8
2 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
View File

@ -469,6 +469,14 @@ private final class CameraScreenComponent: CombinedComponent {
let smallPanelWidth = min(component.panelWidth, 88.0) let smallPanelWidth = min(component.panelWidth, 88.0)
let panelWidth = min(component.panelWidth, 185.0) let panelWidth = min(component.panelWidth, 185.0)
var controlsBottomInset: CGFloat = 0.0
if !isTablet {
let previewHeight = floorToScreenPixels(availableSize.width * 1.77778)
if availableSize.height < previewHeight + 30.0 {
controlsBottomInset = -48.0
}
}
let topControlInset: CGFloat = 20.0 let topControlInset: CGFloat = 20.0
if case .none = state.cameraState.recording, !state.isTransitioning { if case .none = state.cameraState.recording, !state.isTransitioning {
let cancelButton = cancelButton.update( let cancelButton = cancelButton.update(
@ -493,7 +501,7 @@ private final class CameraScreenComponent: CombinedComponent {
transition: .immediate transition: .immediate
) )
context.add(cancelButton context.add(cancelButton
.position(CGPoint(x: isTablet ? smallPanelWidth / 2.0 : topControlInset + cancelButton.size.width / 2.0, y: environment.safeInsets.top + topControlInset + cancelButton.size.height / 2.0)) .position(CGPoint(x: isTablet ? smallPanelWidth / 2.0 : topControlInset + cancelButton.size.width / 2.0, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + cancelButton.size.height / 2.0))
.appear(.default(scale: true)) .appear(.default(scale: true))
.disappear(.default(scale: true)) .disappear(.default(scale: true))
) )
@ -553,7 +561,7 @@ private final class CameraScreenComponent: CombinedComponent {
transition: .immediate transition: .immediate
) )
context.add(flashButton context.add(flashButton
.position(CGPoint(x: isTablet ? availableSize.width - smallPanelWidth / 2.0 : availableSize.width - topControlInset - flashButton.size.width / 2.0 - 5.0, y: environment.safeInsets.top + topControlInset + flashButton.size.height / 2.0)) .position(CGPoint(x: isTablet ? availableSize.width - smallPanelWidth / 2.0 : availableSize.width - topControlInset - flashButton.size.width / 2.0 - 5.0, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + flashButton.size.height / 2.0))
.appear(.default(scale: true)) .appear(.default(scale: true))
.disappear(.default(scale: true)) .disappear(.default(scale: true))
) )
@ -578,7 +586,7 @@ private final class CameraScreenComponent: CombinedComponent {
transition: .immediate transition: .immediate
) )
context.add(dualButton context.add(dualButton
.position(CGPoint(x: availableSize.width - topControlInset - flashButton.size.width / 2.0 - 52.0, y: environment.safeInsets.top + topControlInset + dualButton.size.height / 2.0 + 1.0)) .position(CGPoint(x: availableSize.width - topControlInset - flashButton.size.width / 2.0 - 52.0, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlInset) + dualButton.size.height / 2.0 + 1.0))
.appear(.default(scale: true)) .appear(.default(scale: true))
.disappear(.default(scale: true)) .disappear(.default(scale: true))
) )
@ -702,7 +710,7 @@ private final class CameraScreenComponent: CombinedComponent {
if isTablet { if isTablet {
captureControlsPosition = CGPoint(x: availableSize.width - panelWidth / 2.0, y: availableSize.height / 2.0) captureControlsPosition = CGPoint(x: availableSize.width - panelWidth / 2.0, y: availableSize.height / 2.0)
} else { } else {
captureControlsPosition = CGPoint(x: availableSize.width / 2.0, y: availableSize.height - captureControls.size.height / 2.0 - environment.safeInsets.bottom - 5.0) captureControlsPosition = CGPoint(x: availableSize.width / 2.0, y: availableSize.height - captureControls.size.height / 2.0 - environment.safeInsets.bottom - 5.0 + floorToScreenPixels(controlsBottomInset * 0.66))
} }
context.add(captureControls context.add(captureControls
.position(captureControlsPosition) .position(captureControlsPosition)
@ -834,7 +842,7 @@ private final class CameraScreenComponent: CombinedComponent {
if isTablet { if isTablet {
modeControlPosition = CGPoint(x: availableSize.width - panelWidth / 2.0, y: availableSize.height / 2.0 + modeControl.size.height + 26.0) modeControlPosition = CGPoint(x: availableSize.width - panelWidth / 2.0, y: availableSize.height / 2.0 + modeControl.size.height + 26.0)
} else { } else {
modeControlPosition = CGPoint(x: availableSize.width / 2.0, y: availableSize.height - environment.safeInsets.bottom + modeControl.size.height / 2.0) modeControlPosition = CGPoint(x: availableSize.width / 2.0, y: availableSize.height - environment.safeInsets.bottom + modeControl.size.height / 2.0 + controlsBottomInset)
} }
context.add(modeControl context.add(modeControl
.clipsToBounds(true) .clipsToBounds(true)
@ -1658,13 +1666,16 @@ public class CameraScreen: ViewController {
isTablet = false isTablet = false
} }
var topInset: CGFloat = (layout.statusBarHeight ?? 0.0) + 5.0
let previewSize: CGSize let previewSize: CGSize
if isTablet { if isTablet {
previewSize = CGSize(width: floorToScreenPixels(layout.size.height / 1.77778), height: layout.size.height) previewSize = CGSize(width: floorToScreenPixels(layout.size.height / 1.77778), height: layout.size.height)
} else { } else {
previewSize = CGSize(width: layout.size.width, height: floorToScreenPixels(layout.size.width * 1.77778)) previewSize = CGSize(width: layout.size.width, height: floorToScreenPixels(layout.size.width * 1.77778))
if layout.size.height < previewSize.height + 30.0 {
topInset = 0.0
}
} }
let topInset: CGFloat = (layout.statusBarHeight ?? 0.0) + 5.0
let bottomInset = layout.size.height - previewSize.height - topInset let bottomInset = layout.size.height - previewSize.height - topInset
let panelWidth: CGFloat let panelWidth: CGFloat

79
submodules/TelegramUI/Components/MediaEditorScreen/Sources/MediaEditorScreen.swift
View File

@ -637,8 +637,9 @@ final class MediaEditorScreenComponent: Component {
let buttonSideInset: CGFloat let buttonSideInset: CGFloat
let buttonBottomInset: CGFloat = 8.0 let buttonBottomInset: CGFloat = 8.0
var controlsBottomInset: CGFloat = 0.0
let previewSize: CGSize let previewSize: CGSize
let topInset: CGFloat = environment.statusBarHeight + 5.0 var topInset: CGFloat = environment.statusBarHeight + 5.0
if isTablet { if isTablet {
let previewHeight = availableSize.height - topInset - 75.0 let previewHeight = availableSize.height - topInset - 75.0
previewSize = CGSize(width: floorToScreenPixels(previewHeight / 1.77778), height: previewHeight) previewSize = CGSize(width: floorToScreenPixels(previewHeight / 1.77778), height: previewHeight)
@ -646,6 +647,10 @@ final class MediaEditorScreenComponent: Component {
} else { } else {
previewSize = CGSize(width: availableSize.width, height: floorToScreenPixels(availableSize.width * 1.77778)) previewSize = CGSize(width: availableSize.width, height: floorToScreenPixels(availableSize.width * 1.77778))
buttonSideInset = 10.0 buttonSideInset = 10.0
if availableSize.height < previewSize.height + 30.0 {
topInset = 0.0
controlsBottomInset = -50.0
}
} }
let cancelButtonSize = self.cancelButton.update( let cancelButtonSize = self.cancelButton.update(
@ -673,7 +678,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 44.0, height: 44.0) containerSize: CGSize(width: 44.0, height: 44.0)
) )
let cancelButtonFrame = CGRect( let cancelButtonFrame = CGRect(
origin: CGPoint(x: buttonSideInset, y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset), origin: CGPoint(x: buttonSideInset, y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset),
size: cancelButtonSize size: cancelButtonSize
) )
if let cancelButtonView = self.cancelButton.view { if let cancelButtonView = self.cancelButton.view {
@ -705,7 +710,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 44.0, height: 44.0) containerSize: CGSize(width: 44.0, height: 44.0)
) )
let doneButtonFrame = CGRect( let doneButtonFrame = CGRect(
origin: CGPoint(x: availableSize.width - buttonSideInset - doneButtonSize.width, y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset), origin: CGPoint(x: availableSize.width - buttonSideInset - doneButtonSize.width, y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset),
size: doneButtonSize size: doneButtonSize
) )
if let doneButtonView = self.doneButton.view { if let doneButtonView = self.doneButton.view {
@ -742,7 +747,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 40.0, height: 40.0) containerSize: CGSize(width: 40.0, height: 40.0)
) )
let drawButtonFrame = CGRect( let drawButtonFrame = CGRect(
origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 4.0 - 3.0 - drawButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + 1.0), origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 4.0 - 3.0 - drawButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset + 1.0),
size: drawButtonSize size: drawButtonSize
) )
if let drawButtonView = self.drawButton.view { if let drawButtonView = self.drawButton.view {
@ -771,7 +776,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 40.0, height: 40.0) containerSize: CGSize(width: 40.0, height: 40.0)
) )
let textButtonFrame = CGRect( let textButtonFrame = CGRect(
origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 2.5 + 5.0 - textButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + 1.0), origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 2.5 + 5.0 - textButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset + 2.0),
size: textButtonSize size: textButtonSize
) )
if let textButtonView = self.textButton.view { if let textButtonView = self.textButton.view {
@ -800,7 +805,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 40.0, height: 40.0) containerSize: CGSize(width: 40.0, height: 40.0)
) )
let stickerButtonFrame = CGRect( let stickerButtonFrame = CGRect(
origin: CGPoint(x: floorToScreenPixels(availableSize.width - buttonsLeftOffset - buttonsAvailableWidth / 2.5 - 5.0 - stickerButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + 1.0), origin: CGPoint(x: floorToScreenPixels(availableSize.width - buttonsLeftOffset - buttonsAvailableWidth / 2.5 - 5.0 - stickerButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset + 2.0),
size: stickerButtonSize size: stickerButtonSize
) )
if let stickerButtonView = self.stickerButton.view { if let stickerButtonView = self.stickerButton.view {
@ -829,7 +834,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 40.0, height: 40.0) containerSize: CGSize(width: 40.0, height: 40.0)
) )
let toolsButtonFrame = CGRect( let toolsButtonFrame = CGRect(
origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 4.0 * 3.0 + 3.0 - toolsButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + 1.0), origin: CGPoint(x: buttonsLeftOffset + floorToScreenPixels(buttonsAvailableWidth / 4.0 * 3.0 + 3.0 - toolsButtonSize.width / 2.0), y: availableSize.height - environment.safeInsets.bottom + buttonBottomInset + controlsBottomInset + 1.0),
size: toolsButtonSize size: toolsButtonSize
) )
if let toolsButtonView = self.toolsButton.view { if let toolsButtonView = self.toolsButton.view {
@ -884,7 +889,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: availableSize.width - scrubberInset * 2.0, height: availableSize.height) containerSize: CGSize(width: availableSize.width - scrubberInset * 2.0, height: availableSize.height)
) )
let scrubberFrame = CGRect(origin: CGPoint(x: scrubberInset, y: availableSize.height - environment.safeInsets.bottom - scrubberSize.height - 8.0), size: scrubberSize) let scrubberFrame = CGRect(origin: CGPoint(x: scrubberInset, y: availableSize.height - environment.safeInsets.bottom - scrubberSize.height - 8.0 + controlsBottomInset), size: scrubberSize)
if let scrubberView = self.scrubber.view { if let scrubberView = self.scrubber.view {
if scrubberView.superview == nil { if scrubberView.superview == nil {
self.addSubview(scrubberView) self.addSubview(scrubberView)
@ -1075,7 +1080,7 @@ final class MediaEditorScreenComponent: Component {
sizeValue = textEntity.fontSize sizeValue = textEntity.fontSize
} }
var inputPanelBottomInset: CGFloat = scrubberBottomInset var inputPanelBottomInset: CGFloat = scrubberBottomInset - controlsBottomInset
if inputHeight > 0.0 { if inputHeight > 0.0 {
inputPanelBottomInset = inputHeight - environment.safeInsets.bottom inputPanelBottomInset = inputHeight - environment.safeInsets.bottom
} }
@ -1197,7 +1202,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 44.0, height: 44.0) containerSize: CGSize(width: 44.0, height: 44.0)
) )
let saveButtonFrame = CGRect( let saveButtonFrame = CGRect(
origin: CGPoint(x: availableSize.width - 20.0 - saveButtonSize.width, y: environment.safeInsets.top + 20.0), origin: CGPoint(x: availableSize.width - 20.0 - saveButtonSize.width, y: max(environment.statusBarHeight + 10.0, environment.safeInsets.top + 20.0)),
size: saveButtonSize size: saveButtonSize
) )
if let saveButtonView = self.saveButton.view { if let saveButtonView = self.saveButton.view {
@ -1270,7 +1275,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 44.0, height: 44.0) containerSize: CGSize(width: 44.0, height: 44.0)
) )
let muteButtonFrame = CGRect( let muteButtonFrame = CGRect(
origin: CGPoint(x: availableSize.width - 20.0 - muteButtonSize.width - 50.0, y: environment.safeInsets.top + 20.0), origin: CGPoint(x: availableSize.width - 20.0 - muteButtonSize.width - 50.0, y: max(environment.statusBarHeight + 10.0, environment.safeInsets.top + 20.0)),
size: muteButtonSize size: muteButtonSize
) )
if let muteButtonView = self.muteButton.view { if let muteButtonView = self.muteButton.view {
@ -1293,44 +1298,6 @@ final class MediaEditorScreenComponent: Component {
} }
} }
if let _ = state.playerState {
let settingsButtonSize = self.settingsButton.update(
transition: transition,
component: AnyComponent(Button(
content: AnyComponent(
BundleIconComponent(
name: "Chat/Input/Media/EntityInputSettingsIcon",
tintColor: UIColor(rgb: 0xffffff)
)
),
action: {
if let controller = environment.controller() as? MediaEditorScreen {
controller.requestSettings()
}
}
)),
environment: {},
containerSize: CGSize(width: 44.0, height: 44.0)
)
let settingsButtonFrame = CGRect(
origin: CGPoint(x: floorToScreenPixels((availableSize.width - settingsButtonSize.width) / 2.0), y: environment.safeInsets.top + 20.0),
size: settingsButtonSize
)
if let settingsButtonView = self.settingsButton.view {
if settingsButtonView.superview == nil {
settingsButtonView.layer.shadowOffset = CGSize(width: 0.0, height: 0.0)
settingsButtonView.layer.shadowRadius = 2.0
settingsButtonView.layer.shadowColor = UIColor.black.cgColor
settingsButtonView.layer.shadowOpacity = 0.35
//self.addSubview(settingsButtonView)
}
transition.setPosition(view: settingsButtonView, position: settingsButtonFrame.center)
transition.setBounds(view: settingsButtonView, bounds: CGRect(origin: .zero, size: settingsButtonFrame.size))
transition.setScale(view: settingsButtonView, scale: displayTopButtons ? 1.0 : 0.01)
transition.setAlpha(view: settingsButtonView, alpha: displayTopButtons && !component.isDismissing && !component.isInteractingWithEntities ? 1.0 : 0.0)
}
}
let textCancelButtonSize = self.textCancelButton.update( let textCancelButtonSize = self.textCancelButton.update(
transition: transition, transition: transition,
component: AnyComponent(Button( component: AnyComponent(Button(
@ -1347,7 +1314,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 100.0, height: 30.0) containerSize: CGSize(width: 100.0, height: 30.0)
) )
let textCancelButtonFrame = CGRect( let textCancelButtonFrame = CGRect(
origin: CGPoint(x: 13.0, y: environment.statusBarHeight + 20.0), origin: CGPoint(x: 13.0, y: max(environment.statusBarHeight + 10.0, environment.safeInsets.top + 20.0)),
size: textCancelButtonSize size: textCancelButtonSize
) )
if let textCancelButtonView = self.textCancelButton.view { if let textCancelButtonView = self.textCancelButton.view {
@ -1376,7 +1343,7 @@ final class MediaEditorScreenComponent: Component {
containerSize: CGSize(width: 100.0, height: 30.0) containerSize: CGSize(width: 100.0, height: 30.0)
) )
let textDoneButtonFrame = CGRect( let textDoneButtonFrame = CGRect(
origin: CGPoint(x: availableSize.width - textDoneButtonSize.width - 13.0, y: environment.statusBarHeight + 20.0), origin: CGPoint(x: availableSize.width - textDoneButtonSize.width - 13.0, y: max(environment.statusBarHeight + 10.0, environment.safeInsets.top + 20.0)),
size: textDoneButtonSize size: textDoneButtonSize
) )
if let textDoneButtonView = self.textDoneButton.view { if let textDoneButtonView = self.textDoneButton.view {
@ -1405,9 +1372,10 @@ final class MediaEditorScreenComponent: Component {
environment: {}, environment: {},
containerSize: CGSize(width: 30.0, height: 240.0) containerSize: CGSize(width: 30.0, height: 240.0)
) )
let textSizeTopInset = max(environment.safeInsets.top, environment.statusBarHeight)
let bottomInset: CGFloat = inputHeight > 0.0 ? inputHeight : environment.safeInsets.bottom let bottomInset: CGFloat = inputHeight > 0.0 ? inputHeight : environment.safeInsets.bottom
let textSizeFrame = CGRect( let textSizeFrame = CGRect(
origin: CGPoint(x: 0.0, y: environment.safeInsets.top + (availableSize.height - environment.safeInsets.top - bottomInset) / 2.0 - textSizeSize.height / 2.0), origin: CGPoint(x: 0.0, y: textSizeTopInset + (availableSize.height - textSizeTopInset - bottomInset) / 2.0 - textSizeSize.height / 2.0),
size: textSizeSize size: textSizeSize
) )
if let textSizeView = self.textSize.view { if let textSizeView = self.textSize.view {
@ -2703,15 +2671,18 @@ public final class MediaEditorScreen: ViewController, UIDropInteractionDelegate
isTablet = false isTablet = false
} }
let topInset: CGFloat = (layout.statusBarHeight ?? 0.0) + 5.0 var topInset: CGFloat = (layout.statusBarHeight ?? 0.0) + 5.0
let previewSize: CGSize let previewSize: CGSize
if isTablet { if isTablet {
let previewHeight = layout.size.height - topInset - 75.0 let previewHeight = layout.size.height - topInset - 75.0
previewSize = CGSize(width: floorToScreenPixels(previewHeight / 1.77778), height: previewHeight) previewSize = CGSize(width: floorToScreenPixels(previewHeight / 1.77778), height: previewHeight)
} else { } else {
previewSize = CGSize(width: layout.size.width, height: floorToScreenPixels(layout.size.width * 1.77778)) previewSize = CGSize(width: layout.size.width, height: floorToScreenPixels(layout.size.width * 1.77778))
if layout.size.height < previewSize.height + 30.0 {
topInset = 0.0
}
} }
let bottomInset = layout.size.height - previewSize.height - topInset let bottomInset = max(0.0, layout.size.height - previewSize.height - topInset)
var layoutInputHeight = layout.inputHeight ?? 0.0 var layoutInputHeight = layout.inputHeight ?? 0.0
if self.stickerScreen != nil { if self.stickerScreen != nil {