From ca28e9871e55b92017a5c1949e6eb285752198cc Mon Sep 17 00:00:00 2001 From: Adam Demasi Date: Thu, 9 Sep 2021 23:20:51 +0930 Subject: [PATCH] Show a no backups label; fix some layout issues --- .../xcshareddata/xcschemes/FlashBack.xcscheme | 98 +++++++++++ FlashBack/Base.lproj/Main.storyboard | 165 ++++++++++-------- FlashBack/ViewController.h | 3 +- FlashBack/ViewController.m | 8 + 4 files changed, 199 insertions(+), 75 deletions(-) create mode 100644 FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme diff --git a/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme b/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme new file mode 100644 index 0000000..2f12bb2 --- /dev/null +++ b/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FlashBack/Base.lproj/Main.storyboard b/FlashBack/Base.lproj/Main.storyboard index fdc6111..a3a28dc 100644 --- a/FlashBack/Base.lproj/Main.storyboard +++ b/FlashBack/Base.lproj/Main.storyboard @@ -13,7 +13,7 @@ - + @@ -220,15 +220,15 @@ - - + + - - + + - - - - - - - - - + + + + + + + + + - - + + - - + + - - - - - - - + + + + + + + - - + + - + - - - - - - - - + + + + + + + - - + + - + - - - - - - - - - - + + + + + + + - - + + - - + + - - - - - + + + + + + + @@ -612,11 +618,21 @@ + + + + + @@ -662,6 +678,7 @@ + diff --git a/FlashBack/ViewController.h b/FlashBack/ViewController.h index 8e27f23..8c1de77 100755 --- a/FlashBack/ViewController.h +++ b/FlashBack/ViewController.h @@ -13,7 +13,8 @@ IBOutlet UILabel *selectedBackupText; IBOutlet UIImageView *selectedBackupImage; IBOutlet UIPickerView *selectedBackupPickerView; - + IBOutlet UILabel *noBackupsLabel; + } @property (weak, nonatomic) IBOutlet UILabel *FlashBackTitle; diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index 4472cc6..fa0337c 100755 --- a/FlashBack/ViewController.m +++ b/FlashBack/ViewController.m @@ -64,6 +64,7 @@ NSString *backupNameSelected; _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; [self->selectedBackupPickerView reloadAllComponents]; + self->noBackupsLabel.hidden = _backupFolderArray.count != 0; [finishedCreateAlert dismissViewControllerAnimated:YES completion:nil]; @@ -229,6 +230,7 @@ NSString *backupNameSelected; _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; [self->selectedBackupPickerView reloadAllComponents]; + self->noBackupsLabel.hidden = _backupFolderArray.count != 0; }]; [finishedUpdateAlert addAction:ok]; @@ -336,6 +338,7 @@ NSString *backupNameSelected; _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; [self->selectedBackupPickerView reloadAllComponents]; + self->noBackupsLabel.hidden = _backupFolderArray.count != 0; [deleteFinishedAlert dismissViewControllerAnimated:YES completion:nil]; @@ -363,6 +366,10 @@ NSString *backupNameSelected; [super viewDidLoad]; if (@available(iOS 11.0, *)) { + if ([UIScreen mainScreen].bounds.size.height < 600) { + self.navigationController.navigationBar.prefersLargeTitles = NO; + } + if (self.navigationController.navigationBar.prefersLargeTitles){ UIButton *createBackupButton = [UIButton buttonWithType:UIButtonTypeSystem]; [createBackupButton addTarget:self action:@selector(createBackup:) forControlEvents:UIControlEventTouchUpInside]; @@ -387,6 +394,7 @@ NSString *backupNameSelected; // 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]; + self->noBackupsLabel.hidden = _backupFolderArray.count != 0; }