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

Merge commit '0b6c9946b23dc76592eff15e3e0a3b0169882de0'

Browse Source
This commit is contained in:
Isaac 2024-11-04 12:58:25 +01:00
commit 6e414bd747
3 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
submodules/LegacyComponents/Sources/TGCameraController.m
View File

@ -2743,10 +2743,16 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
{ {
case PGCameraModeVideo: case PGCameraModeVideo:
{ {
if (widescreenWidth == 926.0f) if (widescreenWidth == 956.0f)
return CGRectMake(0, 82, screenSize.width, screenSize.height - 82 - 83);
else if (widescreenWidth == 932.0f)
return CGRectMake(0, 82, screenSize.width, screenSize.height - 82 - 83);
else if (widescreenWidth == 926.0f)
return CGRectMake(0, 82, screenSize.width, screenSize.height - 82 - 83); return CGRectMake(0, 82, screenSize.width, screenSize.height - 82 - 83);
else if (widescreenWidth == 896.0f) else if (widescreenWidth == 896.0f)
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 83); return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 83);
else if (widescreenWidth == 874.0f)
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 83);
else if (widescreenWidth == 812.0f) else if (widescreenWidth == 812.0f)
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68); return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68);
else else
@ -2770,13 +2776,17 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
default: default:
{ {
if (widescreenWidth == 932.0f) if (widescreenWidth == 956.0f)
return CGRectMake(0, 136, screenSize.width, screenSize.height - 136 - 234);
else if (widescreenWidth == 932.0f)
return CGRectMake(0, 136, screenSize.width, screenSize.height - 136 - 223); return CGRectMake(0, 136, screenSize.width, screenSize.height - 136 - 223);
else if (widescreenWidth == 926.0f) else if (widescreenWidth == 926.0f)
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 234); return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 234);
else if (widescreenWidth == 896.0f) else if (widescreenWidth == 896.0f)
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 223); return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 223);
if (widescreenWidth == 852.0f) else if (widescreenWidth == 874.0f)
return CGRectMake(0, 121, screenSize.width, screenSize.height - 135 - 202);
else if (widescreenWidth == 852.0f)
return CGRectMake(0, 136, screenSize.width, screenSize.height - 136 - 192); return CGRectMake(0, 136, screenSize.width, screenSize.height - 136 - 192);
else if (widescreenWidth == 844.0f) else if (widescreenWidth == 844.0f)
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 191); return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 191);

13
submodules/LegacyComponents/Sources/TGCameraMainPhoneView.m
View File

@ -113,7 +113,18 @@
CGFloat shutterButtonWidth = 66.0f; CGFloat shutterButtonWidth = 66.0f;
CGSize screenSize = TGScreenSize(); CGSize screenSize = TGScreenSize();
CGFloat widescreenWidth = MAX(screenSize.width, screenSize.height); CGFloat widescreenWidth = MAX(screenSize.width, screenSize.height);
if (widescreenWidth == 932.0f) if (widescreenWidth == 956.0f)
{
_topPanelOffset = 48.0f;
_topPanelHeight = 48.0f;
_bottomPanelOffset = 83.0f;
_bottomPanelHeight = 140.0f;
_modeControlOffset = -1.0f;
_modeControlHeight = 66.0f;
_counterOffset = 7.0f;
shutterButtonWidth = 72.0f;
}
else if (widescreenWidth == 932.0f)
{ {
_topPanelOffset = 48.0f; _topPanelOffset = 48.0f;
_topPanelHeight = 48.0f; _topPanelHeight = 48.0f;

4
submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift
View File

@ -31,13 +31,11 @@ public final class GiftItemComponent: Component {
return [ return [
UIColor(rgb: 0x522124), UIColor(rgb: 0x522124),
UIColor(rgb: 0x653634) UIColor(rgb: 0x653634)
] ]
} else { } else {
return [ return [
UIColor(rgb: 0xed1c26), UIColor(rgb: 0xed1c26),
UIColor(rgb: 0xff5c55) UIColor(rgb: 0xff5c55)
] ]
} }
case .blue: case .blue:
@ -359,7 +357,7 @@ public final class GiftItemComponent: Component {
} }
ribbonTextView.bounds = CGRect(origin: .zero, size: ribbonTextSize) ribbonTextView.bounds = CGRect(origin: .zero, size: ribbonTextSize)
if self.ribbon.image == nil || themeUpdated { if self.ribbon.image == nil || themeUpdated || previousComponent?.ribbon?.color != component.ribbon?.color {
self.ribbon.image = generateGradientTintedImage(image: UIImage(bundleImageName: "Premium/GiftRibbon"), colors: ribbon.color.colors(theme: component.theme), direction: .diagonal) self.ribbon.image = generateGradientTintedImage(image: UIImage(bundleImageName: "Premium/GiftRibbon"), colors: ribbon.color.colors(theme: component.theme), direction: .diagonal)
} }
if let ribbonImage = self.ribbon.image { if let ribbonImage = self.ribbon.image {