diff --git a/iphone/Maps/Classes/MapsAppDelegate.h b/iphone/Maps/Classes/MapsAppDelegate.h index 8d6204d4a8..13bdc04c6c 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.h +++ b/iphone/Maps/Classes/MapsAppDelegate.h @@ -2,6 +2,7 @@ @class MapViewController; @class SettingsManager; +@class Preferences; @interface MapsAppDelegate : NSObject { @@ -10,6 +11,8 @@ MapViewController * m_mapViewController; SettingsManager * m_settingsManager; NSInteger m_standbyCounter; + + Preferences * m_preferences; } @property (nonatomic, retain) IBOutlet UINavigationController * m_navigationController; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index ebbb8b6e91..624b9b026b 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -1,6 +1,7 @@ #import "MapsAppDelegate.h" #import "MapViewController.h" #import "SettingsManager.h" +#import "Preferences.h" @implementation MapsAppDelegate @@ -30,6 +31,8 @@ - (void) applicationDidFinishLaunching: (UIApplication *) application { + m_preferences = [[Preferences alloc] init]; + [m_window addSubview:m_mapViewController.view]; [m_window makeKeyAndVisible]; } @@ -43,6 +46,7 @@ - (void) dealloc { + [m_preferences release]; [m_settingsManager release]; m_mapViewController = nil; m_window = nil; diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index af47957545..e08cf14a07 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -62,6 +62,8 @@ FA0660041286168700FEA989 /* Default-Landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = FA0660021286168700FEA989 /* Default-Landscape.png */; }; FA09E01113F71F6C007E69CA /* SearchVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA09E01013F71F6C007E69CA /* SearchVC.mm */; }; FA0E845E138554CF008CEABB /* languages.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA0E845D138554CF008CEABB /* languages.txt */; }; + FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA29FDA9141E77F8004ADF66 /* Preferences.mm */; }; + FA29FDAC141E7D84004ADF66 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = FA29FDAB141E7D84004ADF66 /* Settings.bundle */; }; FA2EF9C713630C3B00E3E484 /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FA2EF9C613630C3B00E3E484 /* libplatform.a */; }; FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA34BEC81338D72F00FFB2A7 /* CustomAlertView.mm */; }; FA4135EA120A263C0062D5B4 /* CountriesViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA4135E2120A263C0062D5B4 /* CountriesViewController.mm */; }; @@ -667,6 +669,9 @@ FA09E00F13F71F6C007E69CA /* SearchVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchVC.h; sourceTree = ""; }; FA09E01013F71F6C007E69CA /* SearchVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchVC.mm; sourceTree = ""; }; FA0E845D138554CF008CEABB /* languages.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = languages.txt; path = ../../data/languages.txt; sourceTree = SOURCE_ROOT; }; + FA29FDA8141E77F8004ADF66 /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preferences.h; path = Settings/Preferences.h; sourceTree = ""; }; + FA29FDA9141E77F8004ADF66 /* Preferences.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = Preferences.mm; path = Settings/Preferences.mm; sourceTree = ""; }; + FA29FDAB141E7D84004ADF66 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = ""; }; FA2EF9C613630C3B00E3E484 /* libplatform.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libplatform.a; sourceTree = SOURCE_ROOT; }; FA34BEC81338D72F00FFB2A7 /* CustomAlertView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CustomAlertView.mm; sourceTree = ""; }; FA34BEC91338D72F00FFB2A7 /* CustomAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomAlertView.h; sourceTree = ""; }; @@ -1282,6 +1287,7 @@ 29B97314FDCFA39411CA2CEA /* Maps */ = { isa = PBXGroup; children = ( + FA29FDAB141E7D84004ADF66 /* Settings.bundle */, FA34BEC71338D6DB00FFB2A7 /* Common */, FA6E1F1B124E6B2800F59149 /* Platform */, FA4135DF120A25B90062D5B4 /* Settings */, @@ -1432,6 +1438,8 @@ FA4135E2120A263C0062D5B4 /* CountriesViewController.mm */, FA4135E6120A263C0062D5B4 /* SettingsManager.h */, FA4135E7120A263C0062D5B4 /* SettingsManager.mm */, + FA29FDA8141E77F8004ADF66 /* Preferences.h */, + FA29FDA9141E77F8004ADF66 /* Preferences.mm */, ); name = Settings; sourceTree = ""; @@ -2570,6 +2578,7 @@ FAF8052F1417E3510024E8C1 /* za@2x.png in Resources */, FAF805301417E3510024E8C1 /* zm@2x.png in Resources */, FAF805311417E3510024E8C1 /* zw@2x.png in Resources */, + FA29FDAC141E7D84004ADF66 /* Settings.bundle in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2596,6 +2605,7 @@ FA34BECA1338D72F00FFB2A7 /* CustomAlertView.mm in Sources */, FA09E01113F71F6C007E69CA /* SearchVC.mm in Sources */, FABF223E13FAA97A003D4D49 /* CompassView.mm in Sources */, + FA29FDAA141E77F8004ADF66 /* Preferences.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/iphone/Maps/Settings.bundle/Root.plist b/iphone/Maps/Settings.bundle/Root.plist new file mode 100644 index 0000000000..35b3735ae2 --- /dev/null +++ b/iphone/Maps/Settings.bundle/Root.plist @@ -0,0 +1,39 @@ + + + + + PreferenceSpecifiers + + + Title + General + Type + PSGroupSpecifier + + + Type + PSMultiValueSpecifier + Title + Measurement + Key + measurementKey + DefaultValue + 1 + Titles + + Metric (m/km) + Imperial (yd/mi) + Imperial (ft/mi) + + Values + + 1 + 2 + 3 + + + + StringsTable + Root + + diff --git a/iphone/Maps/Settings.bundle/en.lproj/Root.strings b/iphone/Maps/Settings.bundle/en.lproj/Root.strings new file mode 100644 index 0000000000..e69de29bb2 diff --git a/iphone/Maps/Settings/Preferences.h b/iphone/Maps/Settings/Preferences.h new file mode 100644 index 0000000000..766f969eea --- /dev/null +++ b/iphone/Maps/Settings/Preferences.h @@ -0,0 +1,10 @@ +#import + +/// Synchronizes device's Settings/App Preferences panel with +/// internal settings.ini file, also initializes app preferences +/// if Settings panel was not opened +@interface Preferences : NSObject + ++ (void)setupByPreferences; + +@end diff --git a/iphone/Maps/Settings/Preferences.mm b/iphone/Maps/Settings/Preferences.mm new file mode 100644 index 0000000000..6d3bc72ac0 --- /dev/null +++ b/iphone/Maps/Settings/Preferences.mm @@ -0,0 +1,89 @@ +#import "Preferences.h" +#import + +#include "../../platform/settings.hpp" + +NSString * kMeasurementKey = @"measurementKey"; + +@implementation Preferences + +- (id)init +{ + self = [super init]; + if (self) + { + [Preferences setupByPreferences]; + // listen for changes to our preferences when the Settings app does so, + // when we are resumed from the backround, this will give us a chance to update our UI + [[NSNotificationCenter defaultCenter] addObserver:self + selector:@selector(defaultsChanged:) + name:NSUserDefaultsDidChangeNotification + object:nil]; + } + return self; +} + +- (void)dealloc +{ + [[NSNotificationCenter defaultCenter] removeObserver:self + name:NSUserDefaultsDidChangeNotification + object:nil]; + [super dealloc]; +} + ++ (void)setupByPreferences +{ + NSInteger measurement = [[NSUserDefaults standardUserDefaults] integerForKey:kMeasurementKey]; + if (measurement == 0) + { + // no default values have been set, create them here based on what's in our Settings bundle info + NSString * pathStr = [[NSBundle mainBundle] bundlePath]; + NSString * settingsBundlePath = [pathStr stringByAppendingPathComponent:@"Settings.bundle"]; + NSString * finalPath = [settingsBundlePath stringByAppendingPathComponent:@"Root.plist"]; + + NSDictionary * settingsDict = [NSDictionary dictionaryWithContentsOfFile:finalPath]; + NSArray * prefSpecifierArray = [settingsDict objectForKey:@"PreferenceSpecifiers"]; + + + NSNumber * measurementDefault = nil; + + NSDictionary * prefItem; + for (prefItem in prefSpecifierArray) + { + NSString * keyValueStr = [prefItem objectForKey:@"Key"]; + id defaultValue = [prefItem objectForKey:@"DefaultValue"]; + + if ([keyValueStr isEqualToString:kMeasurementKey]) + { + measurementDefault = defaultValue; + measurement = [measurementDefault integerValue]; + } + } + + // since no default values have been set (i.e. no preferences file created), create it here + NSDictionary * appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: + measurementDefault, kMeasurementKey, + nil]; + + [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; + [[NSUserDefaults standardUserDefaults] synchronize]; + } + + // Update our settings because they're used inside framework ัั‰ะบัƒ + switch (measurement) + { + case 1: Settings::Set("Units", Settings::Metric); break; + case 2: Settings::Set("Units", Settings::Yard); break; + case 3: Settings::Set("Units", Settings::Foot); break; + default: NSLog(@"Warning: Invalid measurement in preferences: %d", measurement); + } +} + +// we are being notified that our preferences have changed (user changed them in the Settings app) +// so read in the changes and update our UI. +- (void)defaultsChanged:(NSNotification *)notif +{ + [Preferences setupByPreferences]; +} + +@end diff --git a/platform/settings.cpp b/platform/settings.cpp index 5dd5184126..0b8fec1c0d 100644 --- a/platform/settings.cpp +++ b/platform/settings.cpp @@ -145,18 +145,22 @@ namespace Settings { switch (v) { - case Yard: return "Y"; - case Foot: return "F"; - default: return "M"; + case Yard: return "Yard"; + case Foot: return "Foot"; + default: return "Metric"; } } template <> bool FromString(string const & s, Units & v) { - if (s == "M") v = Metric; - else if (s == "Y") v = Yard; - else if (s == "F") v = Foot; - else return false; + if (s == "Metric") + v = Metric; + else if (s == "Yard") + v = Yard; + else if (s == "Foot") + v = Foot; + else + return false; return true; }