ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-16 17:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Ilya Laktyushin
2018-04-19 03:58:58 +04:00
parent 8d70d3f413
commit f40bc0730c
5 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LegacyComponents/TGMenuSheetButtonItemView.h
View File

@@ -22,6 +22,8 @@ typedef enum
- (instancetype)initWithTitle:(NSString *)title type:(TGMenuSheetButtonType)type action:(void (^)(void))action;
- (void)setCollapsed:(bool)collapsed animated:(bool)animated;
@end
extern const CGFloat TGMenuSheetButtonItemViewHeight;

10
LegacyComponents/TGMenuSheetButtonItemView.m
View File

@@ -13,6 +13,7 @@ const CGFloat TGMenuSheetButtonItemViewHeight = 57.0f;
@interface TGMenuSheetButtonItemView ()
{
bool _collapsed;
bool _dark;
bool _requiresDivider;
@@ -121,9 +122,16 @@ const CGFloat TGMenuSheetButtonItemViewHeight = 57.0f;
[_button setTitleColor:(type == TGMenuSheetButtonTypeDestructive) ? destructiveColor : accentColor];
}
- (void)setCollapsed:(bool)collapsed animated:(bool)animated
{
_collapsed = collapsed;
[self _updateHeightAnimated:animated];
}
- (CGFloat)preferredHeightForWidth:(CGFloat)__unused width screenHeight:(CGFloat)__unused screenHeight
{
return TGMenuSheetButtonItemViewHeight;
_button.alpha = _collapsed ? 0.0f : 1.0f;
return _collapsed ? 0.0f : TGMenuSheetButtonItemViewHeight;
}
- (bool)requiresDivider

10
LegacyComponents/TGMessage.mm
View File

@@ -367,7 +367,7 @@ typedef enum {
+ (NSArray *)textCheckingResultsForText:(NSString *)text highlightMentionsAndTags:(bool)highlightMentionsAndTags highlightCommands:(bool)highlightCommands entities:(NSArray *)entities highlightAsExternalMentionsAndHashtags:(bool)highlightAsExternalMentionsAndHashtags
{
if (entities != nil || true) {
if (entities != nil) {
NSMutableArray *textCheckingResults = [[NSMutableArray alloc] init];
bool hasPhoneEntities = false;
@@ -451,7 +451,7 @@ typedef enum {
NSError *error = nil;
static NSDataDetector *dataDetector = nil;
if (dataDetector == nil)
dataDetector = [NSDataDetector dataDetectorWithTypes:(int)(NSTextCheckingTypePhoneNumber | NSTextCheckingTypeDate) error:&error];
dataDetector = [NSDataDetector dataDetectorWithTypes:(int)(NSTextCheckingTypePhoneNumber) error:&error];
[dataDetector enumerateMatchesInString:text options:0 range:NSMakeRange(0, text.length) usingBlock:^(NSTextCheckingResult *match, __unused NSMatchingFlags flags, __unused BOOL *stop)
{
NSTextCheckingType type = [match resultType];
@@ -459,10 +459,6 @@ typedef enum {
{
[textCheckingResults addObject:match];
}
if (type == NSTextCheckingTypeDate)
{
[textCheckingResults addObject:match];
}
}];
}
}
@@ -834,7 +830,7 @@ typedef enum {
if (legacyTextCheckingResults.count > 0)
return legacyTextCheckingResults;
if (_mediaAttachments.count != 0 || true) {
if (_mediaAttachments.count != 0) {
bool hasPhoneEntities = false;
for (TGMediaAttachment *attachment in _mediaAttachments) {

1
LegacyComponents/TGViewController.h
View File

@@ -134,6 +134,7 @@ typedef enum {
- (void)setLeftBarButtonItem:(UIBarButtonItem *)leftBarButtonItem animated:(BOOL)animated;
- (void)setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem;
- (void)setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem animated:(BOOL)animated;
- (void)setRightBarButtonItems:(NSArray *)rightBarButtonItems animated:(BOOL)animated;
- (void)setTitleText:(NSString *)titleText;
- (void)setTitleView:(UIView *)titleView;

46
LegacyComponents/TGViewController.mm
View File

@@ -131,7 +131,7 @@ static std::set<int> autorotationLockIds;
@property (nonatomic, weak) UIViewController *targetNavigationTitleController;
@property (nonatomic, strong) UIBarButtonItem *leftBarButtonItem;
@property (nonatomic, strong) UIBarButtonItem *rightBarButtonItem;
@property (nonatomic, strong) NSArray *rightBarButtonItems;
@property (nonatomic, strong) NSString *titleText;
@property (nonatomic, strong) UIView *titleView;
@@ -1337,8 +1337,8 @@ static id<LegacyComponentsContext> _defaultContext = nil;
if (targetNavigationItem != nil && updated)
{
[[self _currentNavigationItem] setLeftBarButtonItem:_leftBarButtonItem animated:false];
[self _setRightBarButtonItem:_rightBarButtonItem animated:false];
[[self _currentNavigationItem] setRightBarButtonItem:_rightBarButtonItem animated:false];
[self _setRightBarButtonItems:_rightBarButtonItems animated:false];
[[self _currentNavigationItem] setRightBarButtonItems:_rightBarButtonItems animated:false];
[[self _currentNavigationItem] setTitle:_titleText];
[[self _currentTitleController] setTitle:_titleText];
[[self _currentNavigationItem] setTitleView:_titleView];
@@ -1373,25 +1373,43 @@ static id<LegacyComponentsContext> _defaultContext = nil;
- (void)setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem animated:(BOOL)animated
{
_rightBarButtonItem = rightBarButtonItem;
NSMutableArray *items = [[NSMutableArray alloc] init];
if (rightBarButtonItem != nil)
[items addObject:rightBarButtonItem];
[self _setRightBarButtonItem:rightBarButtonItem animated:animated];
_rightBarButtonItems = items;
[self _setRightBarButtonItems:items animated:animated];
}
- (void)_setRightBarButtonItem:(UIBarButtonItem *)rightBarButtonItem animated:(BOOL)animated
- (void)setRightBarButtonItems:(NSArray *)rightBarButtonItems animated:(BOOL)animated {
_rightBarButtonItems = rightBarButtonItems;
[self _setRightBarButtonItems:rightBarButtonItems animated:animated];
}
- (void)_setRightBarButtonItems:(NSArray *)rightBarButtonItems animated:(BOOL)animated
{
if (iosMajorVersion() >= 11 && !TGIsPad() && rightBarButtonItem.customView != nil)
if (rightBarButtonItems.count < 2)
{
UIBarButtonItem *spacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
spacer.width = 8.0f;
[[self _currentNavigationItem] setRightBarButtonItem:nil animated:false];
[[self _currentNavigationItem] setRightBarButtonItems:@[spacer, rightBarButtonItem] animated:animated];
UIBarButtonItem *rightBarButtonItem = rightBarButtonItems.firstObject;
if (iosMajorVersion() >= 11 && !TGIsPad() && rightBarButtonItem.customView != nil)
{
UIBarButtonItem *spacer = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFixedSpace target:nil action:nil];
spacer.width = 8.0f;
[[self _currentNavigationItem] setRightBarButtonItem:nil animated:false];
[[self _currentNavigationItem] setRightBarButtonItems:@[spacer, rightBarButtonItem] animated:animated];
}
else
{
if (iosMajorVersion() >= 11 && !TGIsPad())
[[self _currentNavigationItem] setRightBarButtonItems:nil animated:false];
[[self _currentNavigationItem] setRightBarButtonItem:rightBarButtonItem animated:animated];
}
}
else
{
if (iosMajorVersion() >= 11 && !TGIsPad())
[[self _currentNavigationItem] setRightBarButtonItems:nil animated:false];
[[self _currentNavigationItem] setRightBarButtonItem:rightBarButtonItem animated:animated];
[[self _currentNavigationItem] setRightBarButtonItem:nil animated:false];
[[self _currentNavigationItem] setRightBarButtonItems:rightBarButtonItems animated:false];
}
}