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

Fixed build for iPhone

Browse source
This commit is contained in:
Alex Zolotarev 2010-12-29 02:58:21 +02:00 • committed by Alex Zolotarev
parent 45cdf78471
commit 5210236a20
8 changed files with 41 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,14 +8,14 @@
#include "../../yg/internal/opengl.hpp"
#include "../../yg/screen.hpp"
#include "../../map/drawer_yg.hpp"
#include "../../map/storage.hpp"
#include "../../storage/storage.hpp"
typedef FrameWork<model::FeaturesFetcher, Navigator, iphone::WindowHandle> framework_t;
@implementation MapViewController
framework_t * m_framework = NULL;
mapinfo::Storage m_storage;
storage::Storage m_storage;
- (void) OnMyPositionClicked: (id)sender
{

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

@ -38,6 +38,7 @@
EEE4C9421298A31B007231A9 /* basic_highres.skn in Resources */ = {isa = PBXBuildFile; fileRef = EEE4C9411298A31B007231A9 /* basic_highres.skn */; };
EEFC0A9612B561B7002914FF /* dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEFC0A9512B561B7002914FF /* dejavusans.ttf */; };
EEFC0BBF12B5656A002914FF /* libfreetype.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE12020311CD464100ABDD5D /* libfreetype.a */; };
FA04373212CAB83F00017494 /* libstorage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA04373112CAB83F00017494 /* libstorage.a */; };
FA065FED128614C400FEA989 /* MainWindow-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */; };
FA065FFF1286167A00FEA989 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFD1286167A00FEA989 /* Default@2x.png */; };
FA0660001286167A00FEA989 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = FA065FFE1286167A00FEA989 /* Default.png */; };
@ -101,6 +102,7 @@
EEE4C93F1298A303007231A9 /* symbols_48.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = symbols_48.png; path = ../../data/symbols_48.png; sourceTree = SOURCE_ROOT; };
EEE4C9411298A31B007231A9 /* basic_highres.skn */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = basic_highres.skn; path = ../../data/basic_highres.skn; sourceTree = SOURCE_ROOT; };
EEFC0A9512B561B7002914FF /* dejavusans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = dejavusans.ttf; path = ../../data/dejavusans.ttf; sourceTree = "<group>"; };
FA04373112CAB83F00017494 /* libstorage.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libstorage.a; sourceTree = SOURCE_ROOT; };
FA065FEC128614C400FEA989 /* MainWindow-iPad.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "MainWindow-iPad.xib"; path = "Resources-iPad/MainWindow-iPad.xib"; sourceTree = SOURCE_ROOT; };
FA065FFD1286167A00FEA989 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = SOURCE_ROOT; };
FA065FFE1286167A00FEA989 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; };
@ -145,6 +147,7 @@
EE12021011CD464100ABDD5D /* libmap.a in Frameworks */,
EE12021211CD464100ABDD5D /* libyg.a in Frameworks */,
FA87151B12B1518F00592DAF /* SystemConfiguration.framework in Frameworks */,
FA04373212CAB83F00017494 /* libstorage.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -266,6 +269,7 @@
FA1DE68411E15D4E00C6D69A /* Static Libraries */ = {
isa = PBXGroup;
children = (
FA04373112CAB83F00017494 /* libstorage.a */,
EE1201FF11CD464100ABDD5D /* libbase.a */,
EE12020011CD464100ABDD5D /* libcoding.a */,
EE12020111CD464100ABDD5D /* libcurl.a */,
@ -409,11 +413,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_PREPROCESSOR_DEFINITIONS = _DEBUG;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_DIR)/Projects/omim-iphone-build/out/release\"",
"\"$(DEVELOPER_DIR)/Projects/omim/iphone/Maps\"",
);
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -504,11 +503,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_PREPROCESSOR_DEFINITIONS = _DEBUG;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_DIR)/Projects/omim-iphone-build/out/release\"",
"\"$(DEVELOPER_DIR)/Projects/omim/iphone/Maps\"",
);
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -560,11 +554,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_PREPROCESSOR_DEFINITIONS = _DEBUG;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_DIR)/Projects/omim-iphone-build/out/release\"",
"\"$(DEVELOPER_DIR)/Projects/omim/iphone/Maps\"",
);
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};
@ -616,11 +605,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_PREPROCESSOR_DEFINITIONS = _DEBUG;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(DEVELOPER_DIR)/Projects/omim-iphone-build/out/release\"",
"\"$(DEVELOPER_DIR)/Projects/omim/iphone/Maps\"",
);
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
};

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

@ -1,12 +1,12 @@
#import <UIKit/UIKit.h>
namespace mapinfo { class Storage; }
namespace storage { class Storage; }
@interface CountriesViewController
: UIViewController <UINavigationBarDelegate, UITableViewDelegate, UITableViewDataSource, UIActionSheetDelegate>
{
}
- (id) initWithStorage: (mapinfo::Storage &) storage;
- (id) initWithStorage: (storage::Storage &) storage;
@end

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

@ -5,7 +5,7 @@
#include <netinet/in.h>
#import <SystemConfiguration/SCNetworkReachability.h>
#include "../../../map/storage.hpp"
#include "../../../storage/storage.hpp"
#include <boost/bind.hpp>
#define NAVIGATION_BAR_HEIGHT 44
@ -14,6 +14,8 @@
#define GB 1000*1000*1000
#define MB 1000*1000
using namespace storage;
/////////////////////////////////////////////////////////////////
// needed for trick with back button
@ -29,19 +31,19 @@
@implementation CountriesViewController
mapinfo::Storage * g_pStorage = 0;
Storage * g_pStorage = 0;
- (id) initWithStorage: (mapinfo::Storage &)storage
- (id) initWithStorage: (Storage &)storage
{
g_pStorage = &storage;
if ((self = [super initWithNibName:@"CountriesViewController" bundle:nil]))
{
// tricky boost::bind for objC class methods
typedef void (*TFinishFunc)(id, SEL, mapinfo::TIndex const &);
typedef void (*TFinishFunc)(id, SEL, TIndex const &);
SEL finishSel = @selector(OnDownloadFinished:);
TFinishFunc finishImpl = (TFinishFunc)[self methodForSelector:finishSel];
typedef void (*TProgressFunc)(id, SEL, mapinfo::TIndex const &, TDownloadProgress const &);
typedef void (*TProgressFunc)(id, SEL, TIndex const &, TDownloadProgress const &);
SEL progressSel = @selector(OnDownload:withProgress:);
TProgressFunc progressImpl = (TProgressFunc)[self methodForSelector:progressSel];
@ -118,13 +120,13 @@
return g_pStorage->CountriesCountInGroup(section);
}
- (void) UpdateCell: (UITableViewCell *) cell forCountry: (mapinfo::TIndex const &) countryIndex
- (void) UpdateCell: (UITableViewCell *) cell forCountry: (TIndex const &) countryIndex
{
UIActivityIndicatorView * indicator = (UIActivityIndicatorView *)cell.accessoryView;
switch (g_pStorage->CountryStatus(countryIndex))
{
case mapinfo::EOnDisk:
case EOnDisk:
{
uint64_t size = g_pStorage->CountrySizeInBytes(countryIndex);
// convert size to human readable values
@ -150,7 +152,7 @@
cell.accessoryView = nil;
}
break;
case mapinfo::EDownloading:
case EDownloading:
{
cell.textLabel.textColor = [UIColor blueColor];
if (!indicator)
@ -163,12 +165,12 @@
[indicator startAnimating];
}
break;
case mapinfo::EDownloadFailed:
case EDownloadFailed:
cell.textLabel.textColor = [UIColor redColor];
cell.detailTextLabel.text = @"Download has failed :(";
cell.accessoryView = nil;
break;
case mapinfo::EInQueue:
case EInQueue:
{
cell.textLabel.textColor = [UIColor lightGrayColor];
// cell.detailTextLabel.text = [NSString stringWithFormat: @"Waiting to download %qu %s", size, kBOrMB];
@ -183,7 +185,7 @@
[indicator stopAnimating];
}
break;
case mapinfo::ENotDownloaded:
case ENotDownloaded:
cell.textLabel.textColor = [UIColor blackColor];
// cell.detailTextLabel.text = [NSString stringWithFormat: @"Click to download %qu %s", size, kBOrMB];
cell.detailTextLabel.text = [NSString stringWithFormat: @"Touch to download"];
@ -199,7 +201,7 @@
UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier: cellId];
if (cell == nil)
cell = [[[UITableViewCell alloc] initWithStyle: UITableViewCellStyleSubtitle reuseIdentifier:cellId] autorelease];
mapinfo::TIndex countryIndex(indexPath.section, indexPath.row);
TIndex countryIndex(indexPath.section, indexPath.row);
cell.textLabel.text = [NSString stringWithUTF8String:g_pStorage->CountryName(countryIndex).c_str()];
cell.accessoryType = UITableViewCellAccessoryNone;
[self UpdateCell: cell forCountry: countryIndex];
@ -207,7 +209,7 @@
}
// stores clicked country index when confirmation dialog is displayed
mapinfo::TIndex g_clickedIndex;
TIndex g_clickedIndex;
// User confirmation after touching country
- (void) actionSheet: (UIActionSheet *) actionSheet clickedButtonAtIndex: (NSInteger) buttonIndex
@ -216,8 +218,8 @@ mapinfo::TIndex g_clickedIndex;
{ // Delete country
switch (g_pStorage->CountryStatus(g_clickedIndex))
{
case mapinfo::ENotDownloaded:
case mapinfo::EDownloadFailed:
case ENotDownloaded:
case EDownloadFailed:
g_pStorage->DownloadCountry(g_clickedIndex);
break;
default:
@ -257,10 +259,10 @@ mapinfo::TIndex g_clickedIndex;
UITableViewCell * cell = [tableView cellForRowAtIndexPath: indexPath];
NSString * countryName = [[cell textLabel] text];
g_clickedIndex = mapinfo::TIndex(indexPath.section, indexPath.row);
g_clickedIndex = TIndex(indexPath.section, indexPath.row);
switch (g_pStorage->CountryStatus(g_clickedIndex))
{
case mapinfo::EOnDisk:
case EOnDisk:
{ // display confirmation popup
UIActionSheet * popupQuery = [[UIActionSheet alloc]
initWithTitle: countryName
@ -272,8 +274,8 @@ mapinfo::TIndex g_clickedIndex;
[popupQuery release];
}
break;
case mapinfo::ENotDownloaded:
case mapinfo::EDownloadFailed:
case ENotDownloaded:
case EDownloadFailed:
{ // display confirmation popup with country size
BOOL isWifiConnected = [CountriesViewController IsUsingWIFI];
@ -317,7 +319,7 @@ mapinfo::TIndex g_clickedIndex;
// g_pStorage->DownloadCountry(g_clickedIndex);
}
break;
case mapinfo::EDownloading:
case EDownloading:
{ // display confirmation popup
UIActionSheet * popupQuery = [[UIActionSheet alloc]
initWithTitle: countryName
@ -329,14 +331,14 @@ mapinfo::TIndex g_clickedIndex;
[popupQuery release];
}
break;
case mapinfo::EInQueue:
case EInQueue:
// cancel download
g_pStorage->DeleteCountry(g_clickedIndex);
break;
}
}
- (void) OnDownloadFinished: (mapinfo::TIndex const &) index
- (void) OnDownloadFinished: (TIndex const &) index
{
UITableView * tableView = (UITableView *)[self.view.subviews objectAtIndex: 1];
UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: index.second inSection: index.first]];
@ -344,7 +346,7 @@ mapinfo::TIndex g_clickedIndex;
[self UpdateCell: cell forCountry: index];
}
- (void) OnDownload: (mapinfo::TIndex const &) index withProgress: (TDownloadProgress const &) progress
- (void) OnDownload: (TIndex const &) index withProgress: (TDownloadProgress const &) progress
{
UITableView * tableView = (UITableView *)[self.view.subviews objectAtIndex: 1];
UITableViewCell * cell = [tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: index.second inSection: index.first]];

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

@ -1,14 +1,14 @@
#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>
namespace mapinfo { class Storage; }
namespace storage { class Storage; }
/// Responsible for all settings dialogs
@interface SettingsManager : NSObject
{
}
+ (void) Show: (UIViewController *)parentController WithStorage: (mapinfo::Storage &)storage;
+ (void) Show: (UIViewController *)parentController WithStorage: (storage::Storage &)storage;
+ (void) Hide;
@end

6
iphone/Maps/Settings/SettingsManager.mm
View file

@ -1,7 +1,9 @@
#import "SettingsManager.h"
#import "CountriesViewController.h"
#include "../../../map/storage.hpp"
#include "../../../storage/storage.hpp"
using namespace storage;
// Settings are always present globally
//static SettingsManager gInstance;
@ -25,7 +27,7 @@
}
// Currently displays only countries to download
+ (void) Show: (UIViewController *)parentController WithStorage: (mapinfo::Storage &)storage
+ (void) Show: (UIViewController *)parentController WithStorage: (Storage &)storage
{
if (!m_countriesViewController)

12
omim.pro
View file

@ -31,17 +31,7 @@ iphonesimulator-g++42|iphonedevice-g++42 {
geometry \
yg \
indexer \
map \
version
}
bada-simulator|bada-device {
SUBDIRS = 3party \
base \
coding \
geometry \
yg \
indexer \
storage \
map \
version
}

2
storage/storage.pro
View file

@ -5,7 +5,7 @@ TEMPLATE = lib
CONFIG += staticlib
ROOT_DIR = ..
DEPENDENCIES = platform geometry coding base
DEPENDENCIES = geometry coding base
include($$ROOT_DIR/common.pri)