diff options
author | VladiMihaylenko <vxmihaylenko@gmail.com> | 2016-02-11 16:15:13 +0300 |
---|---|---|
committer | Sergey Yershov <yershov@corp.mail.ru> | 2016-03-23 16:17:08 +0300 |
commit | c5d5981f17fd49e1f7eadb459df4dbdcad7bf41d (patch) | |
tree | 34bc91b25bdc2c5d274983e82607a9c2fdc72588 | |
parent | 9143a76fcf5b554fd45448aad3f8495bff9ef697 (diff) |
[ios] Changed navigation bar's image.
-rw-r--r-- | iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm | 4 | ||||
-rw-r--r-- | iphone/Maps/Classes/UIViewController+Navigation.mm | 4 | ||||
-rw-r--r-- | iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json | 23 | ||||
-rw-r--r-- | iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png | bin | 154 -> 0 bytes | |||
-rw-r--r-- | iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png | bin | 219 -> 0 bytes | |||
-rw-r--r-- | iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png | bin | 320 -> 0 bytes |
6 files changed, 4 insertions, 27 deletions
diff --git a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm index 7a6ca0c38c..acccfbd624 100644 --- a/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm +++ b/iphone/Maps/Classes/MWMBookmarkDescriptionViewController.mm @@ -221,12 +221,12 @@ typedef NS_ENUM(NSUInteger, BookmarkDescriptionState) - (UIButton *)backButton { - UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"]; + UIImage * backImage = [UIImage imageNamed:@"ic_nav_bar_back"]; CGFloat const imageSide = backImage.size.width; UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., imageSide, imageSide)]; [button setImage:backImage forState:UIControlStateNormal]; [button addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside]; - button.imageEdgeInsets = UIEdgeInsetsMake(0., -imageSide, 0., 0.); + button.imageEdgeInsets = UIEdgeInsetsMake(0., -32., 0., 0.); return button; } diff --git a/iphone/Maps/Classes/UIViewController+Navigation.mm b/iphone/Maps/Classes/UIViewController+Navigation.mm index 7057f59c68..f8808fb6ff 100644 --- a/iphone/Maps/Classes/UIViewController+Navigation.mm +++ b/iphone/Maps/Classes/UIViewController+Navigation.mm @@ -5,12 +5,12 @@ - (void)showBackButton { - UIImage * backImage = [UIImage imageNamed:@"NavigationBarBackButton"]; + UIImage * backImage = [UIImage imageNamed:@"ic_nav_bar_back"]; CGFloat const imageSide = backImage.size.width; UIButton * button = [[UIButton alloc] initWithFrame:CGRectMake(0., 0., imageSide, imageSide)]; [button setImage:backImage forState:UIControlStateNormal]; [button addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside]; - button.imageEdgeInsets = UIEdgeInsetsMake(0., -imageSide, 0., 0.); + button.imageEdgeInsets = UIEdgeInsetsMake(0., -32, 0., 0.); UIBarButtonItem * leftItem = [[UIBarButtonItem alloc] initWithCustomView:button]; self.navigationItem.leftBarButtonItem = leftItem; } diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json deleted file mode 100644 index c55117d32e..0000000000 --- a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "ic_back.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "ic_back@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "ic_back@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -}
\ No newline at end of file diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png Binary files differdeleted file mode 100644 index ff6fa6dfda..0000000000 --- a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back.png +++ /dev/null diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png Binary files differdeleted file mode 100644 index 89bed02e7f..0000000000 --- a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@2x.png +++ /dev/null diff --git a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png b/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png Binary files differdeleted file mode 100644 index 134c80a3e4..0000000000 --- a/iphone/Maps/Images.xcassets/Navigation Bar/NavigationBarBackButton.imageset/ic_back@3x.png +++ /dev/null |