pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #53 from VladiMihaylenko/vm-master

Browse source 
[ios] Fixed settings crash && fixed map view controller
This commit is contained in:
Илья Гречухин 2015-09-29 13:00:45 +03:00
commit f53a55adf9
9 changed files with 138 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/LocalNotificationManager.mm
View file

@ -54,7 +54,7 @@ typedef void (^CompletionHandler)(UIBackgroundFetchResult);
if ([userInfo[@"Action"] isEqualToString:kDownloadMapActionName])
{
[[Statistics instance] logEvent:@"'Download Map' Notification Clicked"];
[[MapsAppDelegate theApp].m_mapViewController.navigationController popToRootViewControllerAnimated:NO];
[[MapsAppDelegate theApp].mapViewController.navigationController popToRootViewControllerAnimated:NO];
TIndex const index = TIndex([userInfo[@"Group"] intValue], [userInfo[@"Country"] intValue], [userInfo[@"Region"] intValue]);
[self downloadCountryWithIndex:index];

2
iphone/Maps/Classes/MapsAppDelegate.h
View file

@ -17,7 +17,7 @@
@property (nonatomic) UIWindow * window;
@property (nonatomic, weak) IBOutlet MapViewController * m_mapViewController;
@property (nonatomic, readonly) MapViewController * mapViewController;
@property (nonatomic, readonly) LocationManager * m_locationManager;
+ (MapsAppDelegate *)theApp;

25
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -175,9 +175,9 @@ void InitLocalizedStrings()
InitLocalizedStrings();
[self.m_mapViewController onEnterForeground];
[self.mapViewController onEnterForeground];
[Preferences setup:self.m_mapViewController];
[Preferences setup:self.mapViewController];
_m_locationManager = [[LocationManager alloc] init];
[self subscribeToStorage];
@ -223,12 +223,12 @@ void InitLocalizedStrings()
- (void)applicationWillTerminate:(UIApplication *)application
{
[self.m_mapViewController onTerminate];
[self.mapViewController onTerminate];
}
- (void)applicationDidEnterBackground:(UIApplication *)application
{
[self.m_mapViewController onEnterBackground];
[self.mapViewController onEnterBackground];
if (m_activeDownloadsCounter)
{
m_backgroundTask = [application beginBackgroundTaskWithExpirationHandler:^{
@ -246,7 +246,7 @@ void InitLocalizedStrings()
- (void)applicationWillEnterForeground:(UIApplication *)application
{
[self.m_locationManager orientationChanged];
[self.m_mapViewController onEnterForeground];
[self.mapViewController onEnterForeground];
}
- (void)applicationDidBecomeActive:(UIApplication *)application
@ -270,7 +270,7 @@ void InitLocalizedStrings()
{
[[Statistics instance] logApiUsage:m_sourceApplication];
[self showMap];
[self.m_mapViewController showAPIBar];
[self.mapViewController showAPIBar];
}
}
else if (m_fileURL)
@ -334,7 +334,7 @@ void InitLocalizedStrings()
- (void)setMapStyle:(MapStyle)mapStyle
{
[self.m_mapViewController setMapStyle: mapStyle];
[self.mapViewController setMapStyle: mapStyle];
}
- (void)customizeAppearance
@ -417,7 +417,7 @@ void InitLocalizedStrings()
- (void)showMap
{
[(UINavigationController *)self.window.rootViewController popToRootViewControllerAnimated:YES];
[self.m_mapViewController dismissPopover];
[self.mapViewController dismissPopover];
}
- (void)subscribeToStorage
@ -480,6 +480,13 @@ void InitLocalizedStrings()
}
}
#pragma mark - Properties
- (MapViewController *)mapViewController
{
return [(UINavigationController *)self.window.rootViewController viewControllers].firstObject;
}
#pragma mark - Route state
- (void)restoreRouteState
@ -488,7 +495,7 @@ void InitLocalizedStrings()
return;
RouteState const * const state = [RouteState savedState];
if (state.hasActualRoute)
self.m_mapViewController.restoreRouteDestination = state.endPoint;
self.mapViewController.restoreRouteDestination = state.endPoint;
else
[RouteState remove];
}

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

@ -22,8 +22,7 @@
- (UIStoryboard *)mainStoryboard
{
NSString * name = IPAD ? @"Main_iPad" : @"Main_iPhone";
return [UIStoryboard storyboardWithName:name bundle:nil];
return [UIStoryboard storyboardWithName:@"Mapsme" bundle:nil];
}
@end

119
iphone/Maps/Mapsme.storyboard
View file

@ -3,9 +3,10 @@
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
</dependencies>
<scenes>
<!--Mmap View Controller-->
<!--Map View Controller-->
<scene sceneID="Wq1-a3-f7n">
<objects>
<viewController id="xTf-lf-yxN" customClass="MapViewController" sceneMemberID="viewController">
@ -21,11 +22,6 @@
<navigationItem key="navigationItem" id="8E8-0f-UV9"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="cKg-Q7-bFd" userLabel="First Responder" sceneMemberID="firstResponder"/>
<customObject id="Lhh-vc-djn" customClass="MapsAppDelegate">
<connections>
<outlet property="m_mapViewController" destination="xTf-lf-yxN" id="1hz-hc-JUi"/>
</connections>
</customObject>
</objects>
<point key="canvasLocation" x="1134" y="444"/>
</scene>
@ -47,5 +43,116 @@
</objects>
<point key="canvasLocation" x="322" y="444"/>
</scene>
<!--Settings View Controller-->
<scene sceneID="XYc-8Q-Spz">
<objects>
<tableViewController storyboardIdentifier="SettingsViewController" id="Rr6-uj-G5f" customClass="SettingsViewController" sceneMemberID="viewController">
<tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="zyF-i7-Uoj">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SelectableCell" id="6zO-4O-plh" customClass="SelectableCell">
<rect key="frame" x="0.0" y="113.5" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6zO-4O-plh" id="9W6-2l-MFB">
<rect key="frame" x="0.0" y="0.0" width="561" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Metrics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fhF-kM-tcR">
<rect key="frame" x="16" y="11" width="477" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="fhF-kM-tcR" firstAttribute="leading" secondItem="9W6-2l-MFB" secondAttribute="leadingMargin" constant="8" id="9dS-im-XYl"/>
<constraint firstItem="fhF-kM-tcR" firstAttribute="top" secondItem="9W6-2l-MFB" secondAttribute="topMargin" constant="3" id="JIL-dK-S7R"/>
<constraint firstAttribute="bottomMargin" secondItem="fhF-kM-tcR" secondAttribute="bottom" constant="3.5" id="mFZ-wH-Iqg"/>
<constraint firstAttribute="trailingMargin" secondItem="fhF-kM-tcR" secondAttribute="trailing" constant="60" id="u5b-BA-GNg"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="titleLabel" destination="fhF-kM-tcR" id="ivW-qB-zd1"/>
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SwitchCell" id="5Ht-CR-a67" customClass="SwitchCell">
<rect key="frame" x="0.0" y="157.5" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5Ht-CR-a67" id="egv-pz-GkJ">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Statistics" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HGH-S1-QeY">
<rect key="frame" x="16" y="11" width="462" height="21"/>
<inset key="insetFor6xAndEarlier" minX="0.0" minY="0.0" maxX="-25" maxY="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="up5-BH-6Ii">
<rect key="frame" x="538" y="6.5" width="51" height="31"/>
<constraints>
<constraint firstAttribute="height" constant="31" id="o1b-KZ-fJq"/>
<constraint firstAttribute="width" constant="49" id="uJQ-7d-3iY"/>
</constraints>
<inset key="insetFor6xAndEarlier" minX="3" minY="-2" maxX="-3" maxY="2"/>
<color key="onTintColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
</switch>
</subviews>
<constraints>
<constraint firstItem="up5-BH-6Ii" firstAttribute="leading" secondItem="HGH-S1-QeY" secondAttribute="trailing" constant="60" id="NGB-9m-bOa"/>
<constraint firstAttribute="trailingMargin" secondItem="up5-BH-6Ii" secondAttribute="trailing" constant="5" id="QWk-8C-bAG"/>
<constraint firstItem="HGH-S1-QeY" firstAttribute="leading" secondItem="egv-pz-GkJ" secondAttribute="leadingMargin" constant="8" id="Qeq-mR-cx9"/>
<constraint firstItem="HGH-S1-QeY" firstAttribute="top" secondItem="egv-pz-GkJ" secondAttribute="topMargin" constant="3" id="T03-nI-faL"/>
<constraint firstAttribute="bottomMargin" secondItem="HGH-S1-QeY" secondAttribute="bottom" constant="3.5" id="Ula-pA-Yk7"/>
<constraint firstItem="up5-BH-6Ii" firstAttribute="top" secondItem="egv-pz-GkJ" secondAttribute="topMargin" constant="-1.5" id="nQx-6e-sWH"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="switchButton" destination="up5-BH-6Ii" id="P6t-pI-JJm"/>
<outlet property="titleLabel" destination="HGH-S1-QeY" id="QBW-d4-TKD"/>
</connections>
</tableViewCell>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="LinkCell" id="yh8-cr-14c" customClass="LinkCell">
<rect key="frame" x="0.0" y="201.5" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="yh8-cr-14c" id="MYm-HI-oOR">
<rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="About" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8jb-wX-P4h">
<rect key="frame" x="16" y="11" width="483" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="8jb-wX-P4h" firstAttribute="top" secondItem="MYm-HI-oOR" secondAttribute="topMargin" constant="3" id="8Jt-on-XAZ"/>
<constraint firstItem="8jb-wX-P4h" firstAttribute="leading" secondItem="MYm-HI-oOR" secondAttribute="leadingMargin" constant="8" id="Zy7-xE-yIy"/>
<constraint firstAttribute="trailingMargin" secondItem="8jb-wX-P4h" secondAttribute="trailing" constant="60" id="l0M-pq-VZs"/>
<constraint firstAttribute="bottomMargin" secondItem="8jb-wX-P4h" secondAttribute="bottom" constant="3.5" id="ox3-NV-T2v"/>
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="titleLabel" destination="8jb-wX-P4h" id="swZ-rt-c36"/>
</connections>
</tableViewCell>
</prototypes>
<sections/>
<connections>
<outlet property="dataSource" destination="Rr6-uj-G5f" id="2X1-8J-dy3"/>
<outlet property="delegate" destination="Rr6-uj-G5f" id="0CS-tC-qAQ"/>
</connections>
</tableView>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
</tableViewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="I90-hv-hTP" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1143" y="-338"/>
</scene>
</scenes>
</document>

2
iphone/Maps/Platform/LocationManager.mm
View file

@ -215,7 +215,7 @@ static NSString * const kAlohalyticsLocationRequestAlwaysFailed = @"$locationAlw
if (!on)
return NO;
if (!MapsAppDelegate.theApp.m_mapViewController.controlsManager.searchHidden)
if (!MapsAppDelegate.theApp.mapViewController.controlsManager.searchHidden)
return NO;
if (!manager.heading)
return YES;

2
iphone/Maps/Settings/SelectableCell.h
View file

@ -3,6 +3,6 @@
@interface SelectableCell : UITableViewCell
@property (retain, nonatomic) IBOutlet UILabel * titleLabel;
@property (weak, nonatomic) IBOutlet UILabel * titleLabel;
@end

4
iphone/Maps/Settings/SettingsViewController.mm
View file

@ -138,7 +138,7 @@ typedef NS_ENUM(NSUInteger, Section)
else if (indexPath.section == SectionZoomButtons)
{
Settings::Set("ZoomButtonsEnabled", (bool)value);
[MapsAppDelegate theApp].m_mapViewController.controlsManager.zoomHidden = !value;
[MapsAppDelegate theApp].mapViewController.controlsManager.zoomHidden = !value;
}
else if (indexPath.section == SectionCalibration)
{
@ -158,7 +158,7 @@ Settings::Units unitsForIndex(NSInteger index)
Settings::Units units = unitsForIndex(indexPath.row);
Settings::Set("Units", units);
[tableView reloadSections:[NSIndexSet indexSetWithIndex:SectionMetrics] withRowAnimation:UITableViewRowAnimationFade];
[[MapsAppDelegate theApp].m_mapViewController setupMeasurementSystem];
[[MapsAppDelegate theApp].mapViewController setupMeasurementSystem];
}
}

4
iphone/Maps/Settings/SwitchCell.h
View file

@ -10,8 +10,8 @@
@interface SwitchCell : UITableViewCell
@property (retain, nonatomic) IBOutlet UILabel * titleLabel;
@property (retain, nonatomic) IBOutlet UISwitch * switchButton;
@property (weak, nonatomic) IBOutlet UILabel * titleLabel;
@property (weak, nonatomic) IBOutlet UISwitch * switchButton;
@property (weak) id <SwitchCellDelegate> delegate;