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

[ios] Code style fix

Browse source
This commit is contained in:
Igor Khmurets 2014-03-19 21:21:43 +03:00 • committed by Alex Zolotarev
parent e4f0ec2ff4
commit 01efba40ac
11 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
iphone/Maps/Bookmarks/PlacePageVC.mm
View file

@ -140,7 +140,7 @@
if ([_pinTitle isEqualToString:NSLocalizedString(@"dropped_pin", nil)])
[[[self.tableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]].contentView viewWithTag:TEXTFIELD_TAG] becomeFirstResponder];
if (isIPad)
if (IPAD)
{
CGSize size = CGSizeMake(320, 480);
self.contentSizeForViewInPopover = size;
@ -321,7 +321,7 @@
- (void)pushToNavigationControllerAndSetControllerToPopoverSize:(UIViewController *)vc
{
if (isIPad)
if (IPAD)
[vc setContentSizeForViewInPopover:[self contentSizeForViewInPopover]];
[self.navigationController pushViewController:vc animated:YES];
}
@ -333,7 +333,7 @@
- (void)getSuperView:(double &)height width:(double &)width rect:(CGRect &)rect
{
if (isIPhone)
if (!IPAD)
{
rect = [UIScreen mainScreen].bounds;
height = self.view.window.frame.size.height;
@ -609,7 +609,7 @@
- (void)goToTheMap
{
GetFramework().GetBalloonManager().Hide();
if (isIPad)
if (IPAD)
[[MapsAppDelegate theApp].m_mapViewController dismissPopover];
else
[self.navigationController popToRootViewControllerAnimated:YES];
@ -712,12 +712,12 @@
[self.pickerView setBackgroundColor:[UIColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.5]];
UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dismissPicker)];
[self.pickerView addGestureRecognizer:tap];
if (isIPhone)
if (!IPAD)
{
[self.view endEditing:YES];
UIWindow * window = APP.keyWindow;
UIWindow * window = [UIApplication sharedApplication].keyWindow;
if (!window)
window = [APP.windows objectAtIndex:0];
window = [[UIApplication sharedApplication].windows objectAtIndex:0];
[[[window subviews] objectAtIndex:0] addSubview:self.pickerView];
}
else

4
iphone/Maps/Bookmarks/SelectSetVC.mm
View file

@ -1,6 +1,8 @@
#import "SelectSetVC.h"
#import "Framework.h"
#import "AddSetVC.h"
#import "UIKitCategories.h"
@implementation SelectSetVC
@ -66,7 +68,7 @@
if (indexPath.section == 0)
{
AddSetVC * asVC = [[AddSetVC alloc] initWithIndex:m_index];
if (isIPad)
if (IPAD)
[asVC setContentSizeForViewInPopover:[self contentSizeForViewInPopover]];
[self.navigationController pushViewController:asVC animated:YES];
}

10
iphone/Maps/Classes/Common.h Normal file
View file

@ -0,0 +1,10 @@
#define FIRST_LAUNCH_KEY @"FIRST_LAUNCH_KEY"
#define MAPSWITHME_PREMIUM_APPSTORE_URL @"itms-apps://itunes.apple.com/app/id510623322"
#define MAPSWITHME_PREMIUM_LOCAL_URL @"mapswithmepro://"
#define MAPSWITHME_LITE_LOCAL_URL @"mapswithmelite://"
#define BOOKMARK_CATEGORY_DELETED_NOTIFICATION @"BookmarkCategoryDeletedNotification"
#define METRICS_CHANGED_NOTIFICATION @"MetricsChangedNotification"
#define BOOKMARK_DELETED_NOTIFICATION @"BookmarkDeletedNotification"

12
iphone/Maps/Classes/Config.h
View file

@ -1,12 +0,0 @@
#define isIPad (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
#define isIPhone (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone)
#define APP [UIApplication sharedApplication]
#define FIRST_LAUNCH_KEY @"FIRST_LAUNCH_KEY"
#define MAPSWITHME_PREMIUM_APPSTORE_URL @"itms-apps://itunes.apple.com/app/id510623322"
#define MAPSWITHME_PREMIUM_LOCAL_URL @"mapswithmepro://"
#define MAPSWITHME_LITE_LOCAL_URL @"mapswithmelite://"

7
iphone/Maps/Classes/MapViewController.mm
View file

@ -8,7 +8,6 @@
#import "UIKitCategories.h"
#import "SettingsViewController.h"
#import "UIViewController+Navigation.h"
#import "Config.h"
#import "ShareActionSheet.h"
#import "MPInterstitialAdController.h"
#import "MPInterstitialViewController.h"
@ -958,7 +957,7 @@ const long long LITE_IDL = 431183278L;
case FACEBOOK_ALERT_VIEW:
{
NSString * url = [NSString stringWithFormat:FACEBOOK_SCHEME];
if (![APP canOpenURL: [NSURL URLWithString: url]])
if (![[UIApplication sharedApplication] canOpenURL: [NSURL URLWithString: url]])
url = [NSString stringWithFormat:FACEBOOK_URL];
[self manageAlert:buttonIndex andUrl:[NSURL URLWithString: url] andDlgSetting:dlg_settings::FacebookDlg];
return;
@ -1044,7 +1043,7 @@ NSInteger compareAddress(id l, id r, void * context)
- (void)pushViewController:(UIViewController *)vc
{
if (isIPad)
if (IPAD)
{
NavigationController * navC = [[NavigationController alloc] init];
self.popoverVC = [[UIPopoverController alloc] initWithContentViewController:navC];
@ -1096,7 +1095,7 @@ NSInteger compareAddress(id l, id r, void * context)
case 1:
{
dlg_settings::SaveResult(set, dlg_settings::OK);
[APP openURL: url];
[[UIApplication sharedApplication] openURL:url];
break;
}
case 2:

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

@ -6,7 +6,6 @@
#import "Statistics.h"
#import "AarkiContact.h"
#import <MobileAppTracker/MobileAppTracker.h>
#import "Config.h"
#import "UIKitCategories.h"
#import "AppInfo.h"
@ -157,7 +156,8 @@ void InitLocalizedStrings()
attributes[UITextAttributeTextColor] = [UIColor whiteColor];
attributes[UITextAttributeTextShadowColor] = [UIColor clearColor];
[[UINavigationBar appearance] setTintColor:[UIColor colorWithColorCode:@"393655"]];
if (!SYSTEM_VERSION_IS_LESS_THAN(@"7")) {
if (!SYSTEM_VERSION_IS_LESS_THAN(@"7"))
{
[[UIBarButtonItem appearance] setTintColor:[UIColor whiteColor]];
[[UIBarButtonItem appearance] setTitleTextAttributes:attributes forState:UIControlStateNormal];

4
iphone/Maps/Classes/PlacePreviewViewController.mm
View file

@ -79,8 +79,8 @@ typedef enum {APIPOINT, POI, MYPOSITION} Type;
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
if (isIPad)
self.contentSizeForViewInPopover = CGSizeMake(320, 480);;
if (IPAD)
self.contentSizeForViewInPopover = CGSizeMake(320, 480);
}
#pragma mark - Table view data source

3
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -1715,7 +1715,6 @@
ED48BBB917C2B1E2003E7E92 /* CircleView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CircleView.mm; sourceTree = "<group>"; };
ED5D141B181AA8C900B51FB1 /* ic_guide_mark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ic_guide_mark.png; sourceTree = "<group>"; };
ED5D141C181AA8C900B51FB1 /* ic_guide_mark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_guide_mark@2x.png"; sourceTree = "<group>"; };
ED7F47F917D47FD20016850C /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; };
ED8676FA16A0793800D9A02A /* 22x29-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "22x29-pro.png"; sourceTree = "<group>"; };
ED8676FB16A0793800D9A02A /* 44x58-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "44x58-pro.png"; sourceTree = "<group>"; };
ED8676FC16A0793800D9A02A /* 64-pro.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "64-pro.png"; sourceTree = "<group>"; };
@ -2502,7 +2501,7 @@
EDC5C542175F2CA600420E92 /* ShareActionSheet.mm */,
ED48BBAF17BE6EA8003E7E92 /* MWMApi.h */,
ED48BBB017BE6EA8003E7E92 /* MWMApi.mm */,
ED7F47F917D47FD20016850C /* Config.h */,
97DEA09018D706C300C5F963 /* Common.h */,
);
path = Classes;
sourceTree = "<group>";

2
iphone/Maps/Maps_Prefix.pch
View file

@ -2,7 +2,7 @@
// Prefix header for all source files of the 'Maps' target in the 'Maps' project
//
#import "Config.h"
#import "Common.h"
#ifdef __OBJC__
#import <Foundation/Foundation.h>

10
iphone/Maps/Settings/CountriesViewController.mm
View file

@ -7,6 +7,7 @@
#import "DiskFreeSpace.h"
#import "Statistics.h"
#import "Reachability.h"
#import "UIKitCategories.h"
#include "Framework.h"
@ -286,14 +287,15 @@ static bool getGuideName(string & name, storage::TIndex const & index)
NSURL * guideUrl = [NSURL URLWithString:[NSString stringWithUTF8String:info.GetAppID().c_str()]];
NSString * countryName = [NSString stringWithUTF8String:f.Storage().CountryName(m_clickedIndex).c_str()];
[[Statistics instance] logEvent:@"Open Guide Country" withParameters:@{@"Country Name" : countryName}];
if ([APP canOpenURL:guideUrl])
UIApplication * application = [UIApplication sharedApplication];
if ([application canOpenURL:guideUrl])
{
[APP openURL:guideUrl];
[application openURL:guideUrl];
[[Statistics instance] logEvent:@"Open Guide Button" withParameters:@{@"Guide downloaded" : @"YES"}];
}
else
{
[APP openURL:[NSURL URLWithString:[NSString stringWithUTF8String:info.GetURL().c_str()]]];
[application openURL:[NSURL URLWithString:[NSString stringWithUTF8String:info.GetURL().c_str()]]];
[[Statistics instance] logEvent:@"Open Guide Button" withParameters:@{@"Guide downloaded" : @"NO"}];
}
}
@ -495,7 +497,7 @@ static bool getGuideName(string & name, storage::TIndex const & index)
[as addButtonWithTitle:[NSString stringWithUTF8String:guideAdevertiseString.c_str()]];
++numOfButtons;
}
if (isIPhone)
if (!IPAD)
{
[as addButtonWithTitle:NSLocalizedString(@"cancel", nil)];
as.cancelButtonIndex = numOfButtons;

1
iphone/Maps/main.mm
View file

@ -1,7 +1,6 @@
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
#import <Foundation/NSThread.h>
#import "Config.h"
#include "../../platform/settings.hpp"
#include "../../platform/platform.hpp"