diff --git a/FlashBack.xcodeproj/project.pbxproj b/FlashBack.xcodeproj/project.pbxproj index f306ec9..7f1a6d4 100644 --- a/FlashBack.xcodeproj/project.pbxproj +++ b/FlashBack.xcodeproj/project.pbxproj @@ -20,28 +20,9 @@ BDCF069F224B545100ED9A62 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BDCF069E224B545100ED9A62 /* Assets.xcassets */; }; BDCF06A2224B545100ED9A62 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BDCF06A0224B545100ED9A62 /* LaunchScreen.storyboard */; }; BDCF06A5224B545100ED9A62 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BDCF06A4224B545100ED9A62 /* main.m */; }; - BDCF06AF224B545100ED9A62 /* FlashBackTests.m in Sources */ = {isa = PBXBuildFile; fileRef = BDCF06AE224B545100ED9A62 /* FlashBackTests.m */; }; - BDCF06BA224B545100ED9A62 /* FlashBackUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = BDCF06B9224B545100ED9A62 /* FlashBackUITests.m */; }; F25B6A202B1EE24F08E2408D /* libPods-FlashBack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8710948BA24FFBC03A04D4 /* libPods-FlashBack.a */; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - BDCF06AB224B545100ED9A62 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BDCF068A224B544F00ED9A62 /* Project object */; - proxyType = 1; - remoteGlobalIDString = BDCF0691224B544F00ED9A62; - remoteInfo = FlashBack; - }; - BDCF06B6224B545100ED9A62 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = BDCF068A224B544F00ED9A62 /* Project object */; - proxyType = 1; - remoteGlobalIDString = BDCF0691224B544F00ED9A62; - remoteInfo = FlashBack; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 812AE756A45667D1A5844EDE /* Pods-FlashBack.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlashBack.release.xcconfig"; path = "Target Support Files/Pods-FlashBack/Pods-FlashBack.release.xcconfig"; sourceTree = ""; }; 9318182E23B85E8100E3F260 /* UINavigationItem+LargeAccessoryView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationItem+LargeAccessoryView.h"; sourceTree = ""; }; @@ -76,10 +57,8 @@ BDCF06A1224B545100ED9A62 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; BDCF06A3224B545100ED9A62 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; BDCF06A4224B545100ED9A62 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - BDCF06AA224B545100ED9A62 /* FlashBackTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlashBackTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; BDCF06AE224B545100ED9A62 /* FlashBackTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlashBackTests.m; sourceTree = ""; }; BDCF06B0224B545100ED9A62 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - BDCF06B5224B545100ED9A62 /* FlashBackUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlashBackUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; BDCF06B9224B545100ED9A62 /* FlashBackUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlashBackUITests.m; sourceTree = ""; }; BDCF06BB224B545100ED9A62 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; DE8710948BA24FFBC03A04D4 /* libPods-FlashBack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FlashBack.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -94,20 +73,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - BDCF06A7224B545100ED9A62 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - BDCF06B2224B545100ED9A62 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -122,14 +87,15 @@ BDF33795226443090033A3A9 /* Frameworks */, F52D1D0F71680DF63B6C326B /* Pods */, ); + indentWidth = 2; sourceTree = ""; + tabWidth = 2; + usesTabs = 1; }; BDCF0693224B544F00ED9A62 /* Products */ = { isa = PBXGroup; children = ( BDCF0692224B544F00ED9A62 /* FlashBack.app */, - BDCF06AA224B545100ED9A62 /* FlashBackTests.xctest */, - BDCF06B5224B545100ED9A62 /* FlashBackUITests.xctest */, ); name = Products; sourceTree = ""; @@ -226,62 +192,18 @@ productReference = BDCF0692224B544F00ED9A62 /* FlashBack.app */; productType = "com.apple.product-type.application"; }; - BDCF06A9224B545100ED9A62 /* FlashBackTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = BDCF06C1224B545100ED9A62 /* Build configuration list for PBXNativeTarget "FlashBackTests" */; - buildPhases = ( - BDCF06A6224B545100ED9A62 /* Sources */, - BDCF06A7224B545100ED9A62 /* Frameworks */, - BDCF06A8224B545100ED9A62 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - BDCF06AC224B545100ED9A62 /* PBXTargetDependency */, - ); - name = FlashBackTests; - productName = FlashBackTests; - productReference = BDCF06AA224B545100ED9A62 /* FlashBackTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; - BDCF06B4224B545100ED9A62 /* FlashBackUITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = BDCF06C4224B545100ED9A62 /* Build configuration list for PBXNativeTarget "FlashBackUITests" */; - buildPhases = ( - BDCF06B1224B545100ED9A62 /* Sources */, - BDCF06B2224B545100ED9A62 /* Frameworks */, - BDCF06B3224B545100ED9A62 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - BDCF06B7224B545100ED9A62 /* PBXTargetDependency */, - ); - name = FlashBackUITests; - productName = FlashBackUITests; - productReference = BDCF06B5224B545100ED9A62 /* FlashBackUITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ BDCF068A224B544F00ED9A62 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "Micah Gomez"; TargetAttributes = { BDCF0691224B544F00ED9A62 = { CreatedOnToolsVersion = 10.2; }; - BDCF06A9224B545100ED9A62 = { - CreatedOnToolsVersion = 10.2; - TestTargetID = BDCF0691224B544F00ED9A62; - }; - BDCF06B4224B545100ED9A62 = { - CreatedOnToolsVersion = 10.2; - TestTargetID = BDCF0691224B544F00ED9A62; - }; }; }; buildConfigurationList = BDCF068D224B544F00ED9A62 /* Build configuration list for PBXProject "FlashBack" */; @@ -298,8 +220,6 @@ projectRoot = ""; targets = ( BDCF0691224B544F00ED9A62 /* FlashBack */, - BDCF06A9224B545100ED9A62 /* FlashBackTests */, - BDCF06B4224B545100ED9A62 /* FlashBackUITests */, ); }; /* End PBXProject section */ @@ -316,20 +236,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - BDCF06A8224B545100ED9A62 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - BDCF06B3224B545100ED9A62 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -374,37 +280,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - BDCF06A6224B545100ED9A62 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - BDCF06AF224B545100ED9A62 /* FlashBackTests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - BDCF06B1224B545100ED9A62 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - BDCF06BA224B545100ED9A62 /* FlashBackUITests.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - BDCF06AC224B545100ED9A62 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = BDCF0691224B544F00ED9A62 /* FlashBack */; - targetProxy = BDCF06AB224B545100ED9A62 /* PBXContainerItemProxy */; - }; - BDCF06B7224B545100ED9A62 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = BDCF0691224B544F00ED9A62 /* FlashBack */; - targetProxy = BDCF06B6224B545100ED9A62 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin PBXVariantGroup section */ 93891D9323B16D76001480E8 /* Main.storyboard */ = { isa = PBXVariantGroup; @@ -459,6 +336,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -485,7 +363,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -519,6 +397,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -539,7 +418,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -562,7 +441,6 @@ "\"/Users/micahgomez/Downloads/iOS-Runtime-Headers-master/PrivateFrameworks\"/**", ); INFOPLIST_FILE = FlashBack/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -591,7 +469,6 @@ "\"/Users/micahgomez/Downloads/iOS-Runtime-Headers-master/PrivateFrameworks\"/**", ); INFOPLIST_FILE = FlashBack/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -605,76 +482,6 @@ }; name = Release; }; - BDCF06C2224B545100ED9A62 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = FlashBackTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBackTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FlashBack.app/FlashBack"; - }; - name = Debug; - }; - BDCF06C3224B545100ED9A62 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = FlashBackTests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBackTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FlashBack.app/FlashBack"; - }; - name = Release; - }; - BDCF06C5224B545100ED9A62 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = FlashBackUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBackUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = FlashBack; - }; - name = Debug; - }; - BDCF06C6224B545100ED9A62 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - INFOPLIST_FILE = FlashBackUITests/Info.plist; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBackUITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_TARGET_NAME = FlashBack; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -696,24 +503,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - BDCF06C1224B545100ED9A62 /* Build configuration list for PBXNativeTarget "FlashBackTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - BDCF06C2224B545100ED9A62 /* Debug */, - BDCF06C3224B545100ED9A62 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - BDCF06C4224B545100ED9A62 /* Build configuration list for PBXNativeTarget "FlashBackUITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - BDCF06C5224B545100ED9A62 /* Debug */, - BDCF06C6224B545100ED9A62 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = BDCF068A224B544F00ED9A62 /* Project object */; diff --git a/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme b/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme index 2f12bb2..288a429 100644 --- a/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme +++ b/FlashBack.xcodeproj/xcshareddata/xcschemes/FlashBack.xcscheme @@ -1,6 +1,6 @@ - + - + + @@ -24,7 +25,7 @@ - + @@ -46,14 +47,12 @@ @@ -67,11 +66,11 @@ - + - + @@ -95,14 +94,12 @@ - @@ -116,14 +113,14 @@ - + - + @@ -133,7 +130,6 @@ - @@ -151,20 +147,19 @@ - + - + @@ -183,20 +178,19 @@ - + - + @@ -214,34 +208,23 @@ - + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + @@ -608,7 +593,7 @@ - + @@ -625,6 +610,7 @@ + @@ -639,7 +625,7 @@ - + @@ -691,6 +677,12 @@ + + + + + + diff --git a/FlashBack/Info.plist b/FlashBack/Info.plist index b3a8f71..5408044 100755 --- a/FlashBack/Info.plist +++ b/FlashBack/Info.plist @@ -31,7 +31,7 @@ armv7 UIStatusBarStyle - UIStatusBarStyleLightContent + UIStatusBarStyleDefault UISupportedInterfaceOrientations UIInterfaceOrientationPortrait @@ -43,8 +43,6 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight - UIUserInterfaceStyle - Dark UIViewControllerBasedStatusBarAppearance diff --git a/FlashBack/InfoTableViewController.m b/FlashBack/InfoTableViewController.m index 4aa1677..7086328 100644 --- a/FlashBack/InfoTableViewController.m +++ b/FlashBack/InfoTableViewController.m @@ -66,7 +66,7 @@ } -(void)micahTwitterProfile{ - [[UIApplication sharedApplication] openURL:[InfoTableViewController openTwitterProfile:@"MicahPGomez"]]; + [[UIApplication sharedApplication] openURL:[InfoTableViewController openTwitterProfile:@"pogmommy"]]; } -(void)aaronTwitterProfile{ diff --git a/FlashBack/SpecialButton.m b/FlashBack/SpecialButton.m index c81d97f..4ebd7f8 100644 --- a/FlashBack/SpecialButton.m +++ b/FlashBack/SpecialButton.m @@ -23,7 +23,13 @@ } - (void)commonInit { - UIVisualEffectView *blurView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]]; + UIBlurEffect *blurEffect; + if (@available(iOS 13, *)) { + blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleSystemMaterial]; + } else { + blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; + } + UIVisualEffectView *blurView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; blurView.userInteractionEnabled = NO; blurView.clipsToBounds = YES; blurView.layer.cornerRadius = 15; diff --git a/FlashBack/SpecialTableViewCell.m b/FlashBack/SpecialTableViewCell.m index 2aa5700..0a502ff 100644 --- a/FlashBack/SpecialTableViewCell.m +++ b/FlashBack/SpecialTableViewCell.m @@ -16,11 +16,20 @@ self.backgroundColor = [UIColor clearColor]; - UIView *selectionView = [[UIView alloc] init]; - selectionView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1]; - self.selectedBackgroundView = selectionView; + if (@available(iOS 13, *)) { + } else { + UIView *selectionView = [[UIView alloc] init]; + selectionView.backgroundColor = [UIColor colorWithWhite:1 alpha:0.1]; + self.selectedBackgroundView = selectionView; + } - UIVisualEffectView *blurView = [[UIVisualEffectView alloc] initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]]; + UIBlurEffect *blurEffect; + if (@available(iOS 13, *)) { + blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleSystemMaterial]; + } else { + blurEffect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]; + } + UIVisualEffectView *blurView = [[UIVisualEffectView alloc] initWithEffect:blurEffect]; blurView.userInteractionEnabled = NO; self.backgroundView = blurView; } diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index b259a45..e9f9edf 100755 --- a/FlashBack/ViewController.m +++ b/FlashBack/ViewController.m @@ -357,8 +357,11 @@ NSString *backupNameSelected; - (UIStatusBarStyle)preferredStatusBarStyle { - - return UIStatusBarStyleLightContent; + if (@available(iOS 13, *)) { + return UIStatusBarStyleDefault; + } else { + return UIStatusBarStyleLightContent; + } } @@ -395,14 +398,43 @@ NSString *backupNameSelected; //_backupFolderArray = @[@"one",@"two",@"three"]; _backupFolderArray = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/mobile/Library/FlashBack/Backups/" error:nil]; self->noBackupsLabel.hidden = _backupFolderArray.count != 0; + [self pickerView:selectedBackupPickerView didSelectRow:0 inComponent:0]; } - (void)viewDidLayoutSubviews { [super viewDidLayoutSubviews]; - [[selectedBackupPickerView.subviews objectAtIndex:0] setBackgroundColor:[UIColor colorWithWhite:25.f/225.f alpha:0.5]]; - [[selectedBackupPickerView.subviews objectAtIndex:1] setBackgroundColor:[UIColor colorWithWhite:25.f/225.f alpha:0.5]]; + if (@available(iOS 13, *)) { + } else { + [[selectedBackupPickerView.subviews objectAtIndex:0] setBackgroundColor:[UIColor colorWithWhite:25.f/225.f alpha:0.5]]; + [[selectedBackupPickerView.subviews objectAtIndex:1] setBackgroundColor:[UIColor colorWithWhite:25.f/225.f alpha:0.5]]; + } +} + +- (void)viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + + [self traitCollectionDidChange:nil]; +} + +- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection { + [super traitCollectionDidChange:previousTraitCollection]; + + if (@available(iOS 12, *)) { + UIBackgroundStyle style; + switch (self.traitCollection.userInterfaceStyle) { + case UIUserInterfaceStyleDark: + style = UIBackgroundStyleExtraDarkBlur; + break; + + case UIUserInterfaceStyleLight: + case UIUserInterfaceStyleUnspecified: + style = UIBackgroundStyleBlur; + break; + } + [[UIApplication sharedApplication] _setBackgroundStyle:style]; + } } -(void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component{ @@ -435,7 +467,13 @@ NSString *backupNameSelected; - (NSAttributedString *)pickerView:(UIPickerView *)pickerView attributedTitleForRow:(NSInteger)row forComponent:(NSInteger)component { NSString *name = _backupFolderArray[row]; - return [[NSAttributedString alloc] initWithString:name attributes:@{NSForegroundColorAttributeName: [UIColor whiteColor]}]; + UIColor *color; + if (@available(iOS 13, *)) { + color = [UIColor labelColor]; + } else { + color = [UIColor whiteColor]; + } + return [[NSAttributedString alloc] initWithString:name attributes:@{NSForegroundColorAttributeName: color}]; } @end diff --git a/FlashBack/main.m b/FlashBack/main.m index 82a1bf2..da3380f 100755 --- a/FlashBack/main.m +++ b/FlashBack/main.m @@ -7,7 +7,7 @@ // Special thanks to PsychoTea (@IBSparkles) for getting root on kernel patch jailbreaks, as well as for both Electra's and Meridian's "kppless" jailbreakd daemon. -void platformize_me() { +void platformize_me(void) { void* handle = dlopen("/usr/lib/libjailbreak.dylib", RTLD_LAZY); if (!handle) return; @@ -22,7 +22,7 @@ void platformize_me() { ptr(getpid(), FLAG_PLATFORMIZE); } -void patch_setuid() { +void patch_setuid(void) { void* handle = dlopen("/usr/lib/libjailbreak.dylib", RTLD_LAZY); if (!handle) return; diff --git a/Makefile b/Makefile index 8b74326..70b7e9c 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +INSTALL_TARGET_PROCESSES = FlashBack + include $(THEOS)/makefiles/common.mk XCODEPROJ_NAME = FlashBack diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index b6e5985..a45618b 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -187,7 +187,7 @@ 406C3CAF7F5212633BD52C8E300C7530 /* SDWebImageError.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDWebImageError.m; path = SDWebImage/Core/SDWebImageError.m; sourceTree = ""; }; 42124F5071E098324ECDC30AB49A18AD /* UIImage+MultiFormat.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+MultiFormat.h"; path = "SDWebImage/Core/UIImage+MultiFormat.h"; sourceTree = ""; }; 42CCBFB26573914D7A2697923CFD4916 /* UIImageView+WebCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImageView+WebCache.h"; path = "SDWebImage/Core/UIImageView+WebCache.h"; sourceTree = ""; }; - 449BE67094860E6449BDF043D014184D /* libPods-FlashBack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = "libPods-FlashBack.a"; path = "libPods-FlashBack.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 449BE67094860E6449BDF043D014184D /* libPods-FlashBack.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FlashBack.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 4707E7B10A22D35B812D784587308E9A /* SDDiskCache.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDDiskCache.m; path = SDWebImage/Core/SDDiskCache.m; sourceTree = ""; }; 478B9C4CB56F3379C43A86B7B919489F /* SDAssociatedObject.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDAssociatedObject.m; path = SDWebImage/Private/SDAssociatedObject.m; sourceTree = ""; }; 49C43ADBB3484A8752F06A932346DFB1 /* SDWebImageManager.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDWebImageManager.m; path = SDWebImage/Core/SDWebImageManager.m; sourceTree = ""; }; @@ -250,7 +250,7 @@ 998FBDC42BF03803D41DD3FE23FEC3D0 /* SDWebImageDownloader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDWebImageDownloader.h; path = SDWebImage/Core/SDWebImageDownloader.h; sourceTree = ""; }; 9A389AF84FD8EA2D3A3201B8940FE620 /* SDImageLoader.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDImageLoader.h; path = SDWebImage/Core/SDImageLoader.h; sourceTree = ""; }; 9D37B09384BAA601180ED164911947D7 /* SDWebImageIndicator.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDWebImageIndicator.h; path = SDWebImage/Core/SDWebImageIndicator.h; sourceTree = ""; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 9EEF0002168A98F59E01EFCC5903756B /* SDAnimatedImagePlayer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDAnimatedImagePlayer.m; path = SDWebImage/Core/SDAnimatedImagePlayer.m; sourceTree = ""; }; 9F0B88387B2BF1C13968CAEE13E29258 /* SDWebImageCompat.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDWebImageCompat.h; path = SDWebImage/Core/SDWebImageCompat.h; sourceTree = ""; }; 9FF9A0B1F46E94B4DA59E027A2A71C1D /* UIImage+Transform.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "UIImage+Transform.h"; path = "SDWebImage/Core/UIImage+Transform.h"; sourceTree = ""; }; @@ -264,7 +264,7 @@ AB13D01FF57041DE08B0CDC7F3131D10 /* SDAnimatedImageView+WebCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "SDAnimatedImageView+WebCache.h"; path = "SDWebImage/Core/SDAnimatedImageView+WebCache.h"; sourceTree = ""; }; AB71DE2160580E72869D87ED05F55B60 /* SDImageIOAnimatedCoder.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDImageIOAnimatedCoder.h; path = SDWebImage/Core/SDImageIOAnimatedCoder.h; sourceTree = ""; }; AE063F644C80425AF32E01ADC219BCDD /* SDDeviceHelper.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = SDDeviceHelper.h; path = SDWebImage/Private/SDDeviceHelper.h; sourceTree = ""; }; - B0B214D775196BA7CA8E17E53048A493 /* libSDWebImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libSDWebImage.a; path = libSDWebImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; + B0B214D775196BA7CA8E17E53048A493 /* libSDWebImage.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDWebImage.a; sourceTree = BUILT_PRODUCTS_DIR; }; B29378EA64A7CDFC2D42873282F97BD9 /* SDWebImageDefine.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDWebImageDefine.m; path = SDWebImage/Core/SDWebImageDefine.m; sourceTree = ""; }; B32D3A40839D43F9D065B591B619C1E5 /* SDImageTransformer.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; name = SDImageTransformer.m; path = SDWebImage/Core/SDImageTransformer.m; sourceTree = ""; }; B40EB89A1F020B498DDE2EFF7CF293F7 /* NSButton+WebCache.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; name = "NSButton+WebCache.h"; path = "SDWebImage/Core/NSButton+WebCache.h"; sourceTree = ""; }; @@ -333,7 +333,6 @@ 7CC1AE30A1D32E6A5C93EB96828D323E /* Core */, 59E5FD66F5C753CA747324BB25F10800 /* Support Files */, ); - name = SDWebImage; path = SDWebImage; sourceTree = ""; }; @@ -681,7 +680,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 1100; - LastUpgradeCheck = 1100; + LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 9.3"; @@ -870,6 +869,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -930,6 +930,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme index 1841b5b..f8bb6f4 100644 --- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme +++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Pods-FlashBack.xcscheme @@ -1,6 +1,6 @@