kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ios] Fixed nav bar's back button.

Browse source
This commit is contained in:
VladiMihaylenko 2016-03-21 15:56:13 +03:00 • committed by Sergey Yershov
parent f52bd1a1f6
commit 222c74d8d2
7 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm
View file

@ -130,7 +130,7 @@ using namespace osm_auth_ios;
self.googleImage.hidden = YES;
self.facebookImage.hidden = YES;
self.logoutButton.hidden = NO;
self.leftBarButton.image = [UIImage imageNamed:@"btn_back_arrow"];
self.leftBarButton.image = [UIImage imageNamed:@"ic_nav_bar_back"];
}
- (void)configNoAuth:(BOOL)isAfterFirstEdit
@ -154,7 +154,7 @@ using namespace osm_auth_ios;
{
self.title = L(@"profile").capitalizedString;
self.message.text = L(@"login_and_edit_map_motivation_message");
self.leftBarButton.image = [UIImage imageNamed:@"btn_back_arrow"];
self.leftBarButton.image = [UIImage imageNamed:@"ic_nav_bar_back"];
}
}

2
iphone/Maps/Classes/UIViewController+Navigation.mm
View file

@ -18,9 +18,11 @@ CGFloat constexpr kButtonExtraWidth = 16.0;
- (UIBarButtonItem *)backButton
{
UIImage * backImage = [UIImage imageNamed:@"ic_nav_bar_back"];
UIImage * highlightedImage = [UIImage imageNamed:@"ic_nav_bar_back_press"];
CGSize const buttonSize = {backImage.size.width + kButtonExtraWidth, backImage.size.height};
UIButton * button = [[UIButton alloc] initWithFrame:{{}, buttonSize}];
[button setImage:backImage forState:UIControlStateNormal];
[button setImage:highlightedImage forState:UIControlStateHighlighted];
[button addTarget:self action:@selector(backTap) forControlEvents:UIControlEventTouchUpInside];
return [[UIBarButtonItem alloc] initWithCustomView:button];
}

BIN
iphone/Maps/Images.xcassets/btn_back_arrow.imageset/BackArrow.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 162 B

BIN
iphone/Maps/Images.xcassets/btn_back_arrow.imageset/BackArrow@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 275 B

BIN
iphone/Maps/Images.xcassets/btn_back_arrow.imageset/BackArrow@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 413 B

23
iphone/Maps/Images.xcassets/btn_back_arrow.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x",
"filename" : "BackArrow.png"
},
{
"idiom" : "universal",
"scale" : "2x",
"filename" : "BackArrow@2x.png"
},
{
"idiom" : "universal",
"scale" : "3x",
"filename" : "BackArrow@3x.png"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

10
iphone/Maps/Mapsme.storyboard
View file

@ -1875,7 +1875,7 @@
</userDefinedRuntimeAttributes>
</view>
<navigationItem key="navigationItem" id="8bw-ck-hd0">
<barButtonItem key="leftBarButtonItem" image="btn_back_arrow" id="nLP-Eo-Og0">
<barButtonItem key="leftBarButtonItem" image="ic_nav_bar_back" id="nLP-Eo-Og0">
<connections>
<action selector="cancel" destination="4R7-Vk-fQr" id="aCe-5L-ZgM"/>
</connections>
@ -2223,7 +2223,7 @@ the world. Join us!</string>
</constraints>
</view>
<navigationItem key="navigationItem" id="iq0-sF-shH">
<barButtonItem key="leftBarButtonItem" image="btn_back_arrow" id="VjK-MF-Vva">
<barButtonItem key="leftBarButtonItem" image="ic_nav_bar_back" id="VjK-MF-Vva">
<connections>
<action selector="cancel" destination="iZ6-Zi-bkZ" id="zVw-Uf-WVk"/>
</connections>
@ -2520,7 +2520,7 @@ the world. Join us!</string>
</userDefinedRuntimeAttributes>
</view>
<navigationItem key="navigationItem" id="C6C-2o-Zgb">
<barButtonItem key="leftBarButtonItem" image="btn_back_arrow" id="rdp-Bp-r7o">
<barButtonItem key="leftBarButtonItem" image="ic_nav_bar_back" id="rdp-Bp-r7o">
<connections>
<action selector="cancel" destination="Ez0-RI-stE" id="Sff-qi-sbv"/>
</connections>
@ -2715,7 +2715,7 @@ the world. Join us!</string>
</view>
<toolbarItems/>
<navigationItem key="navigationItem" id="hH6-Ln-tTC">
<barButtonItem key="leftBarButtonItem" image="btn_back_arrow" id="f1t-yJ-eWw">
<barButtonItem key="leftBarButtonItem" image="ic_nav_bar_back" id="f1t-yJ-eWw">
<connections>
<action selector="cancel" destination="oZQ-Rp-tGs" id="O9L-tK-wHT"/>
</connections>
@ -2857,11 +2857,11 @@ the world. Join us!</string>
</scene>
</scenes>
<resources>
<image name="btn_back_arrow" width="12" height="20"/>
<image name="ic_arrow_gray_down" width="28" height="28"/>
<image name="ic_arrow_gray_right" width="28" height="28"/>
<image name="ic_device" width="28" height="28"/>
<image name="ic_more" width="28" height="28"/>
<image name="ic_nav_bar_back" width="14" height="22"/>
<image name="ic_upload" width="28" height="28"/>
<image name="img_whatsnew_migration" width="240" height="240"/>
<image name="login_facebook" width="28" height="28"/>