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

Cheery-pick some fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-12-08 18:41:35 +04:00
parent f95cfbdc42
commit 50848269a9
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/Display/Source/NavigationBarBadge.swift
View File

@ -31,7 +31,7 @@ public final class NavigationBarBadgeNode: ASDisplayNode {
self.backgroundNode = ASImageNode()
self.backgroundNode.isLayerBacked = true
self.backgroundNode.displaysAsynchronously = false
self.backgroundNode.image = generateStretchableFilledCircleImage(radius: 18.0, color: fillColor, backgroundColor: nil)
self.backgroundNode.image = generateStretchableFilledCircleImage(radius: 9.0, color: fillColor, backgroundColor: nil)
super.init()
@ -43,7 +43,7 @@ public final class NavigationBarBadgeNode: ASDisplayNode {
self.fillColor = fillColor
self.strokeColor = strokeColor
self.textColor = textColor
self.backgroundNode.image = generateStretchableFilledCircleImage(radius: 18.0, color: fillColor, backgroundColor: nil)
self.backgroundNode.image = generateStretchableFilledCircleImage(radius: 9.0, color: fillColor, backgroundColor: nil)
self.textNode.attributedText = NSAttributedString(string: self.text, font: self.font, textColor: self.textColor)
self.textNode.redrawIfPossible()
}

2
submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
View File

@ -64,7 +64,7 @@ typedef enum {
@property (nonatomic, strong) TGPhotoEntitiesContainerView *entitiesView;
- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab;
- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSAttributedString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab;
- (void)dismissEditor;
- (void)applyEditor;

2
submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
View File

@ -305,7 +305,7 @@
PGPhotoEditorValues *editorValues = (PGPhotoEditorValues *)[item.editingContext adjustmentsForItem:item.editableMediaItem];
NSString *caption = [item.editingContext captionForItem:item.editableMediaItem];
NSAttributedString *caption = [item.editingContext captionForItem:item.editableMediaItem];
CGRect refFrame = CGRectZero;
UIView *editorReferenceView = [self referenceViewForItem:item frame:&refFrame];

6
submodules/LegacyComponents/Sources/TGPhotoEditorController.m
View File

@ -94,7 +94,7 @@
bool _scheduledVideoPlayback;
id<TGMediaEditAdjustments> _initialAdjustments;
NSString *_caption;
NSAttributedString *_caption;
bool _viewFillingWholeScreen;
bool _forceStatusBarVisible;
@ -139,7 +139,7 @@
@synthesize actionHandle = _actionHandle;
- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab
- (instancetype)initWithContext:(id<LegacyComponentsContext>)context item:(id<TGMediaEditableItem>)item intent:(TGPhotoEditorControllerIntent)intent adjustments:(id<TGMediaEditAdjustments>)adjustments caption:(NSAttributedString *)caption screenImage:(UIImage *)screenImage availableTabs:(TGPhotoEditorTab)availableTabs selectedTab:(TGPhotoEditorTab)selectedTab
{
self = [super initWithContext:context];
if (self != nil)
@ -2292,7 +2292,7 @@
_documentController.delegate = self;
[_documentController setUTI:@"com.instagram.exclusivegram"];
if (_caption.length > 0)
[_documentController setAnnotation:@{@"InstagramCaption" : _caption}];
[_documentController setAnnotation:@{@"InstagramCaption" : _caption.string}];
[_documentController presentOpenInMenuFromRect:self.view.frame inView:self.view animated:true];
}];
}

2
submodules/PhotoResources/Sources/PhotoResources.swift
View File

@ -2536,7 +2536,7 @@ public func albumArtThumbnailData(engine: TelegramEngine, thumbnail: ExternalMus
private func albumArtFullSizeDatas(engine: TelegramEngine, thumbnail: ExternalMusicAlbumArtResource, fullSize: ExternalMusicAlbumArtResource, autoFetchFullSize: Bool = true) -> Signal<Tuple3<Data?, Data?, Bool>, NoError> {
return engine.resources.custom(
id: thumbnail.id.stringRepresentation,
id: fullSize.id.stringRepresentation,
fetch: nil,
attemptSynchronously: false
)

2
submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift
View File

@ -444,7 +444,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
self.presentationData = presentationData
self.presentationDataValue.set(.single(presentationData))
self.backgroundColor = presentationData.theme.list.blocksBackgroundColor
self.listNode.keepTopItemOverscrollBackground = ListViewKeepTopItemOverscrollBackground(color: presentationData.theme.chatList.backgroundColor, direction: true)
self.listNode.keepTopItemOverscrollBackground = ListViewKeepTopItemOverscrollBackground(color: presentationData.theme.list.blocksBackgroundColor, direction: true)
self.searchDisplayController?.updatePresentationData(presentationData)
self.leftOverlayNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor
self.rightOverlayNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor