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

[iOS] fix data version format

Browse source 
https://jira.mail.ru/browse/MAPSME-12569
This commit is contained in:
Aleksey Belouosv 2019-12-02 19:52:13 +03:00 • committed by Arsentiy Milchakov
parent fb759ef29c
commit 6255b2e640
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
View file

@ -37,7 +37,7 @@ NS_SWIFT_NAME(FrameworkHelper)
+ (void)uploadUGC:(void (^)(UIBackgroundFetchResult))completionHandler;
+ (NSString *)userAccessToken;
+ (NSString *)userAgent;
+ (NSNumber *)dataVersion;
+ (int64_t)dataVersion;
+ (void)searchInDownloader:(NSString *)query
inputLocale:(NSString *)locale
completion:(SearchInDownloaderCompletions)completion;

4
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
View file

@ -145,8 +145,8 @@
return @(GetPlatform().GetAppUserAgent().Get().c_str());
}
+ (NSNumber *)dataVersion {
return @(GetFramework().GetCurrentDataVersion());
+ (int64_t)dataVersion {
return GetFramework().GetCurrentDataVersion();
}
+ (void)searchInDownloader:(NSString *)query

4
iphone/Maps/UI/Settings/MWMAboutController.m
View file

@ -8,7 +8,7 @@
@interface MWMAboutController () <SettingsTableViewSwitchCellDelegate>
@property(weak, nonatomic) IBOutlet UILabel * versionLabel;
@property(weak, nonatomic) IBOutlet UILabel * dateLabel;
@property(weak, nonatomic) IBOutlet UILabel * dataVersionLabel;
@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * websiteCell;
@property(weak, nonatomic) IBOutlet SettingsTableViewLinkCell * facebookCell;
@ -41,7 +41,7 @@
version = [NSString stringWithFormat:@"%@.%@", version, appInfo.buildNumber];
self.versionLabel.text = [NSString stringWithFormat:L(@"version"), version];
self.dateLabel.text = [NSString stringWithFormat:L(@"date"), [MWMFrameworkHelper dataVersion]];
self.dataVersionLabel.text = [NSString stringWithFormat:L(@"data_version"), [MWMFrameworkHelper dataVersion]];
[self.crashlyticsCell configWithDelegate:self title:L(@"opt_out_fabric") isOn:![MWMSettings crashReportingDisabled]];
}

13
iphone/Maps/UI/Settings/MWMAboutControllerHeader.xib
View file

@ -1,18 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMAboutController">
<connections>
<outlet property="dateLabel" destination="2UY-CN-bbR" id="0ad-Y1-yZq"/>
<outlet property="dataVersionLabel" destination="2UY-CN-bbR" id="0ad-Y1-yZq"/>
<outlet property="headerView" destination="nNn-As-qvg" id="kwi-x5-YnF"/>
<outlet property="versionLabel" destination="eX4-Y6-p2e" id="4Kf-ae-nY1"/>
</connections>
@ -23,7 +20,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="imgLogo" translatesAutoresizingMaskIntoConstraints="NO" id="MNH-d1-GMj">
<rect key="frame" x="128" y="24" width="120" height="120"/>
<rect key="frame" x="127.5" y="24" width="120" height="120"/>
<constraints>
<constraint firstAttribute="width" secondItem="MNH-d1-GMj" secondAttribute="height" multiplier="1:1" id="1UQ-pV-hI7"/>
<constraint firstAttribute="height" priority="750" constant="120" id="9ug-0X-yk5"/>