diff --git a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate index 09e423b..58fc093 100644 Binary files a/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate and b/FlashBack.xcworkspace/xcuserdata/aaron.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FlashBack/ViewController.h b/FlashBack/ViewController.h index fec40f0..8e27f23 100755 --- a/FlashBack/ViewController.h +++ b/FlashBack/ViewController.h @@ -17,6 +17,7 @@ } @property (weak, nonatomic) IBOutlet UILabel *FlashBackTitle; +@property (weak, nonatomic) IBOutlet UINavigationBar *navigationBar; @end diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index 0f7da5c..5e8067d 100755 --- a/FlashBack/ViewController.m +++ b/FlashBack/ViewController.m @@ -327,22 +327,34 @@ NSString *backupNameSelected; - (void)viewDidLoad { - [super viewDidLoad]; - - UIButton *createBackupButton = [UIButton buttonWithType:UIButtonTypeSystem]; - [createBackupButton addTarget:self action:@selector(createBackup:) forControlEvents:UIControlEventTouchUpInside]; - [createBackupButton setImage:[UIImage imageNamed:@"create"] forState:UIControlStateNormal]; - createBackupButton.tintColor = [UIColor systemBlueColor]; - self.navigationItem._largeTitleAccessoryView = createBackupButton; - // Do any additional setup after loading the view. - - selectedBackupPickerView.delegate=self; - selectedBackupPickerView.dataSource=self; - - // MARK: List of Backups is found and added to this array - //_backupFolderArray = @[@"one",@"two",@"three"]; - _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; - + [super viewDidLoad]; + + if (@available(iOS 11.0, *)) { + if (self.navigationController.navigationBar.prefersLargeTitles){ + UIButton *createBackupButton = [UIButton buttonWithType:UIButtonTypeSystem]; + [createBackupButton addTarget:self action:@selector(createBackup:) forControlEvents:UIControlEventTouchUpInside]; + [createBackupButton setImage:[UIImage imageNamed:@"create"] forState:UIControlStateNormal]; + createBackupButton.tintColor = [UIColor systemBlueColor]; + self.navigationItem._largeTitleAccessoryView = createBackupButton; + } + else { + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"create"] style:UIBarButtonItemStylePlain target:self action:@selector(createBackup:)]; + } + } else { + self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"create"] style:UIBarButtonItemStylePlain target:self action:@selector(createBackup:)]; + } + + + + // Do any additional setup after loading the view. + + selectedBackupPickerView.delegate=self; + selectedBackupPickerView.dataSource=self; + + // MARK: List of Backups is found and added to this array + //_backupFolderArray = @[@"one",@"two",@"three"]; + _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; + } - (void)viewDidLayoutSubviews {