ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-01-27 22:39:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '893457ba75dbb847e5318bde333c9b0ffc300420'

Browse Source
This commit is contained in:
Peter
2017-10-04 18:12:14 +03:00
parent a536f339f4 893457ba75
commit 88b5d34187
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LegacyComponents/TGLocationPulseView.m
View File

@@ -31,6 +31,9 @@
{
_circleLayer.hidden = false;
if (_circleLayer.animationKeys.count > 0)
return;
CAKeyframeAnimation *scaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
scaleAnimation.values = @[@0.0f, @0.72f, @1.0f, @1.0f];
scaleAnimation.keyTimes = @[@0.0, @0.49f, @0.88f, @1.0f];

14
LegacyComponents/TGLocationViewController.m
View File

@@ -46,6 +46,7 @@
TGLocationAnnotation *_annotation;
UIBarButtonItem *_actionsBarItem;
bool _didSetRightBarButton;
SVariable *_reloadReady;
SMetaDisposable *_reloadDisposable;
@@ -64,7 +65,6 @@
bool _selectedCurrentLiveLocation;
bool _focusOnOwnLocation;
TGLocationPinAnnotationView *_ownLiveLocationView;
__weak MKAnnotationView *_userLocationView;
}
@@ -245,7 +245,11 @@
{
if ([self hasMoreThanOneLocation])
{
[self setRightBarButtonItem:_actionsBarItem animated:true];
if (!_didSetRightBarButton)
{
_didSetRightBarButton = true;
[self setRightBarButtonItem:_actionsBarItem animated:true];
}
if (actual && self.zoomToFitAllLocationsOnScreen)
{
@@ -263,7 +267,11 @@
}
else
{
[self setRightBarButtonItem:nil animated:true];
if (_didSetRightBarButton)
{
_didSetRightBarButton = false;
[self setRightBarButtonItem:nil animated:true];
}
}
}