From 4cab730c390be9d3bf982cda42912e0e3c8e4f54 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 18 Nov 2015 16:19:35 +0100 Subject: [PATCH] Settings: work in progress for multiaccounts --- Classes/SettingsView.m | 4 +++- .../Controllers/IASKAppSettingsViewController.h | 2 +- .../Controllers/IASKAppSettingsViewController.m | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m index a627fcc29..b488d6160 100644 --- a/Classes/SettingsView.m +++ b/Classes/SettingsView.m @@ -645,7 +645,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController *)sender { } -- (void)settingsViewControllerDidAppear:(IASKAppSettingsViewController *)sender { +- (void)settingsViewControllerWillAppear:(IASKAppSettingsViewController *)sender { // going to account: fill info if ([sender.file isEqualToString:@"Account"]) { LOGI(@"Going editting account %@", sender.title); @@ -846,6 +846,8 @@ static UICompositeViewDescription *compositeDescription = nil; } - (IBAction)onDialerBackClick:(id)sender { + [settingsStore synchronize]; + DialerView *view = VIEW(DialerView); [PhoneMainView.instance changeCurrentView:view.compositeViewDescription]; } diff --git a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h index cc8a87285..a39055b55 100755 --- a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h +++ b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.h @@ -26,7 +26,7 @@ @protocol IASKSettingsDelegate - (void)settingsViewControllerDidEnd:(IASKAppSettingsViewController*)sender; -- (void)settingsViewControllerDidAppear:(IASKAppSettingsViewController *)sender; +- (void)settingsViewControllerWillAppear:(IASKAppSettingsViewController *)sender; @optional #pragma mark - UITableView header customization diff --git a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m index 78bc62aac..3d2d07b47 100755 --- a/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m +++ b/Classes/Utils/InAppSettingsKit/Controllers/IASKAppSettingsViewController.m @@ -206,7 +206,7 @@ CGRect IASKCGRectSwap(CGRect rect); // hack gautier: be notified when changing page if (self.delegate && [self.delegate conformsToProtocol:@protocol(IASKSettingsDelegate)]) { - [self.delegate settingsViewControllerDidAppear:self]; + [self.delegate settingsViewControllerWillAppear:self]; } [super viewWillAppear:animated];