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

Merge pull request #6174 from igrechuhin/cherry

Browse source 
Cherry
This commit is contained in:
Vlad Mihaylenko 2017-06-01 15:00:18 +03:00 • committed by GitHub
commit 1bdb3b0fa2
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -651,12 +651,17 @@ using namespace osm_auth_ios;
[statistics application:application didFinishLaunchingWithOptions:launchOptions];
NSString * connectionType;
NSString * network = kStatOff;
switch (Platform::ConnectionStatus())
{
case Platform::EConnectionType::CONNECTION_NONE: break;
case Platform::EConnectionType::CONNECTION_WIFI: connectionType = @"Wi-Fi"; break;
case Platform::EConnectionType::CONNECTION_WIFI:
connectionType = @"Wi-Fi";
network = kStatWifi;
break;
case Platform::EConnectionType::CONNECTION_WWAN:
connectionType = [[CTTelephonyNetworkInfo alloc] init].currentRadioAccessTechnology;
network = kStatMobile;
break;
}
if (!connectionType)
@ -667,6 +672,20 @@ using namespace osm_auth_ios;
kStatConnection : connectionType
}];
NSString * charging = kStatUnknown;
UIDeviceBatteryState const state = [UIDevice currentDevice].batteryState;
if (state == UIDeviceBatteryStateCharging || state == UIDeviceBatteryStateFull)
charging = kStatOn;
else if (state == UIDeviceBatteryStateUnplugged)
charging = kStatOff;
[Statistics logEvent:kStatApplicationColdStartupInfo
withParameters:@{
kStatBattery : @(UIDevice.currentDevice.batteryLevel * 100),
kStatCharging : charging,
kStatNetwork : network
}];
return returnValue;
}
@ -720,7 +739,6 @@ using namespace osm_auth_ios;
NSForegroundColorAttributeName : [UIColor lightGrayColor],
}
forState:UIControlStateDisabled];
barBtn.tintColor = [UIColor whitePrimaryText];
UIPageControl * pageControl = [UIPageControl appearance];
pageControl.pageIndicatorTintColor = [UIColor blackHintText];

7
iphone/Maps/Common/Statistics/StatisticsStrings.h
View file

@ -12,6 +12,7 @@ static NSString * const kStatAlert = @"Alert";
static NSString * const kStatAllMaps = @"all_maps";
static NSString * const kStatAlways = @"Always";
static NSString * const kStatApplication = @"Application";
static NSString * const kStatApplicationColdStartupInfo = @"Application_ColdStartup_info";
static NSString * const kStatApply = @"Apply";
static NSString * const kStatAsk = @"Ask";
static NSString * const kStatAuthorization = @"Authorization";
@ -19,6 +20,7 @@ static NSString * const kStatAutoDownload = @"Auto download";
static NSString * const kStatAutoZoom = @"Autozoom";
static NSString * const kStatBack = @"Back";
static NSString * const kStatBanner = @"banner";
static NSString * const kStatBattery = @"battery";
static NSString * const kStatBicycle = @"Bicycle";
static NSString * const kStatBooking = @"Booking.com";
static NSString * const kStatBookmarkCreated = @"Bookmark. Bookmark created";
@ -38,6 +40,7 @@ static NSString * const kStatChangeMobileInternet = @"Change mobile internet";
static NSString * const kStatChangeNightMode = @"Change night mode";
static NSString * const kStatChangeRecentTrack = @"Change recent track";
static NSString * const kStatChangeRoutingMode = @"Change routing mode";
static NSString * const kStatCharging = @"charging";
static NSString * const kStatClear = @"Clear";
static NSString * const kStatClose = @"Close";
static NSString * const kStatCollapse = @"Collapse";
@ -136,6 +139,7 @@ static NSString * const kStatMapViewStyleSettings = @"Map view style settings";
static NSString * const kStatMenu = @"Menu";
static NSString * const kStatMigrationBig2SmallMWM = @"Big mwms to small mwms migration counter";
static NSString * const kStatMiles = @"Miles";
static NSString * const kStatMobile = @"mobile";
static NSString * const kStatMobileInternet = @"Mobile Internet";
static NSString * const kStatMopub = @"Mopub";
static NSString * const kStatMoreApps = @"More apps";
@ -144,6 +148,7 @@ static NSString * const kStatMyTargetAppsClicked = @"MyTargetAppsClicked";
static NSString * const kStatMyTargetAppsDisplayed = @"MyTargetAppsDisplayed";
static NSString * const kStatName = @"Name";
static NSString * const kStatNavigationDashboard = @"Navigation dashboard";
static NSString * const kStatNetwork = @"network";
static NSString * const kStatNever = @"Never";
static NSString * const kStatNext = @"Next";
static NSString * const kStatNightMode = @"NightMode";
@ -237,6 +242,7 @@ static NSString * const kStatToggleZoomButtonsVisibility = @"Toggle zoom buttons
static NSString * const kStatTraffic = @"Traffic";
static NSString * const kStatType = @"type";
static NSString * const kStatUber = @"Uber";
static NSString * const kStatUnknown = @"unknown";
static NSString * const kStatUnknownError = @"unknown_error";
static NSString * const kStatUpdate = @"update";
static NSString * const kStatUpdateAll = @"update_all";
@ -244,6 +250,7 @@ static NSString * const kStatValue = @"Value";
static NSString * const kStatVehicle = @"Vehicle";
static NSString * const kStatVisible = @"Visible";
static NSString * const kStatWhatsNew = @"What's New";
static NSString * const kStatWifi = @"wifi";
static NSString * const kStatYes = @"Yes";
static NSString * const kStatZoom = @"Zoom";
static NSString * const kStatiPad = @"iPad";