Merge commit '0b6c9946b23dc76592eff15e3e0a3b0169882de0'

Author: Isaac

submodules/LegacyComponents/Sources/TGCameraController.m

@@ -2743,10 +2743,16 @@ + (CGRect)_cameraPreviewFrameForScreenSize:(CGSize)screenSize mode:(PGCameraMode
         {
             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);
                 else if (widescreenWidth == 896.0f)
                     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)
                     return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68);
                 else
@@ -2770,13 +2776,17 @@ + (CGRect)_cameraPreviewFrameForScreenSize:(CGSize)screenSize mode:(PGCameraMode
 
             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);
                 else if (widescreenWidth == 926.0f)
                     return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 234);
                 else if (widescreenWidth == 896.0f)
                     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);
                 else if (widescreenWidth == 844.0f)
                     return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 191);

submodules/LegacyComponents/Sources/TGCameraMainPhoneView.m

@@ -113,7 +113,18 @@ - (instancetype)initWithFrame:(CGRect)frame avatar:(bool)avatar videoModeByDefau
         CGFloat shutterButtonWidth = 66.0f;
         CGSize screenSize = TGScreenSize();
         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;
             _topPanelHeight = 48.0f;

submodules/TelegramUI/Components/Gifts/GiftItemComponent/Sources/GiftItemComponent.swift

@@ -31,13 +31,11 @@ public final class GiftItemComponent: Component {
                         return [
                             UIColor(rgb: 0x522124),
                             UIColor(rgb: 0x653634)
-                            
                         ]
                     } else {
                         return [
                             UIColor(rgb: 0xed1c26),
                             UIColor(rgb: 0xff5c55)
-                            
                         ]
                     }
                 case .blue:
@@ -359,7 +357,7 @@ public final class GiftItemComponent: Component {
                     }
                     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)
                     }
                     if let ribbonImage = self.ribbon.image {