diff --git a/FlashBack.xcodeproj/project.pbxproj b/FlashBack.xcodeproj/project.pbxproj index 4f78119..d3f07d6 100644 --- a/FlashBack.xcodeproj/project.pbxproj +++ b/FlashBack.xcodeproj/project.pbxproj @@ -446,7 +446,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = PRBH2T6668; + DEVELOPMENT_TEAM = YCX729N7CK; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"/Users/micahgomez/Downloads/iOS-Runtime-Headers-master/PrivateFrameworks\"/**", @@ -457,6 +457,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBack; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -471,7 +472,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = PRBH2T6668; + DEVELOPMENT_TEAM = YCX729N7CK; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"/Users/micahgomez/Downloads/iOS-Runtime-Headers-master/PrivateFrameworks\"/**", @@ -482,6 +483,7 @@ "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = com.mpg13.FlashBack; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; diff --git a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate b/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate index e7da8a6..790624c 100644 Binary files a/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate and b/FlashBack.xcodeproj/project.xcworkspace/xcuserdata/micahgomez.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/FlashBack/Assets.xcassets/.DS_Store b/FlashBack/Assets.xcassets/.DS_Store new file mode 100644 index 0000000..7dcf156 Binary files /dev/null and b/FlashBack/Assets.xcassets/.DS_Store differ diff --git a/FlashBack/Assets.xcassets/create.imageset/Contents.json b/FlashBack/Assets.xcassets/create.imageset/Contents.json new file mode 100644 index 0000000..a9a8e65 --- /dev/null +++ b/FlashBack/Assets.xcassets/create.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M (2).png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (2)-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (2)-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-1.png b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-1.png new file mode 100644 index 0000000..fedcb46 Binary files /dev/null and b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-1.png differ diff --git a/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-2.png b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-2.png new file mode 100644 index 0000000..fedcb46 Binary files /dev/null and b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2)-2.png differ diff --git a/FlashBack/Assets.xcassets/create.imageset/Regular-M (2).png b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2).png new file mode 100644 index 0000000..fedcb46 Binary files /dev/null and b/FlashBack/Assets.xcassets/create.imageset/Regular-M (2).png differ diff --git a/FlashBack/Assets.xcassets/delete.imageset/Contents.json b/FlashBack/Assets.xcassets/delete.imageset/Contents.json new file mode 100644 index 0000000..18f83a7 --- /dev/null +++ b/FlashBack/Assets.xcassets/delete.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M (4).png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (4)-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (4)-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-1.png b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-1.png new file mode 100644 index 0000000..3a76259 Binary files /dev/null and b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-1.png differ diff --git a/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-2.png b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-2.png new file mode 100644 index 0000000..3a76259 Binary files /dev/null and b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4)-2.png differ diff --git a/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4).png b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4).png new file mode 100644 index 0000000..3a76259 Binary files /dev/null and b/FlashBack/Assets.xcassets/delete.imageset/Regular-M (4).png differ diff --git a/FlashBack/Assets.xcassets/details.imageset/Contents.json b/FlashBack/Assets.xcassets/details.imageset/Contents.json new file mode 100644 index 0000000..2dd8891 --- /dev/null +++ b/FlashBack/Assets.xcassets/details.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M (5).png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (5)-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (5)-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-1.png b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-1.png new file mode 100644 index 0000000..a4f2ad7 Binary files /dev/null and b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-1.png differ diff --git a/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-2.png b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-2.png new file mode 100644 index 0000000..a4f2ad7 Binary files /dev/null and b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5)-2.png differ diff --git a/FlashBack/Assets.xcassets/details.imageset/Regular-M (5).png b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5).png new file mode 100644 index 0000000..a4f2ad7 Binary files /dev/null and b/FlashBack/Assets.xcassets/details.imageset/Regular-M (5).png differ diff --git a/FlashBack/Assets.xcassets/package.imageset/Contents.json b/FlashBack/Assets.xcassets/package.imageset/Contents.json new file mode 100644 index 0000000..f174095 --- /dev/null +++ b/FlashBack/Assets.xcassets/package.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M (1).png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (1)-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (1)-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-1.png b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-1.png new file mode 100644 index 0000000..7c833c1 Binary files /dev/null and b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-1.png differ diff --git a/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-2.png b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-2.png new file mode 100644 index 0000000..7c833c1 Binary files /dev/null and b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1)-2.png differ diff --git a/FlashBack/Assets.xcassets/package.imageset/Regular-M (1).png b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1).png new file mode 100644 index 0000000..7c833c1 Binary files /dev/null and b/FlashBack/Assets.xcassets/package.imageset/Regular-M (1).png differ diff --git a/FlashBack/Assets.xcassets/restore.imageset/Contents.json b/FlashBack/Assets.xcassets/restore.imageset/Contents.json new file mode 100644 index 0000000..fa5ad84 --- /dev/null +++ b/FlashBack/Assets.xcassets/restore.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/restore.imageset/Regular-M-1.png b/FlashBack/Assets.xcassets/restore.imageset/Regular-M-1.png new file mode 100644 index 0000000..c0a13b6 Binary files /dev/null and b/FlashBack/Assets.xcassets/restore.imageset/Regular-M-1.png differ diff --git a/FlashBack/Assets.xcassets/restore.imageset/Regular-M-2.png b/FlashBack/Assets.xcassets/restore.imageset/Regular-M-2.png new file mode 100644 index 0000000..c0a13b6 Binary files /dev/null and b/FlashBack/Assets.xcassets/restore.imageset/Regular-M-2.png differ diff --git a/FlashBack/Assets.xcassets/restore.imageset/Regular-M.png b/FlashBack/Assets.xcassets/restore.imageset/Regular-M.png new file mode 100644 index 0000000..c0a13b6 Binary files /dev/null and b/FlashBack/Assets.xcassets/restore.imageset/Regular-M.png differ diff --git a/FlashBack/Assets.xcassets/update.imageset/Contents.json b/FlashBack/Assets.xcassets/update.imageset/Contents.json new file mode 100644 index 0000000..450cec2 --- /dev/null +++ b/FlashBack/Assets.xcassets/update.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Regular-M (3).png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (3)-1.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Regular-M (3)-2.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-1.png b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-1.png new file mode 100644 index 0000000..58e975d Binary files /dev/null and b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-1.png differ diff --git a/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-2.png b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-2.png new file mode 100644 index 0000000..58e975d Binary files /dev/null and b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3)-2.png differ diff --git a/FlashBack/Assets.xcassets/update.imageset/Regular-M (3).png b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3).png new file mode 100644 index 0000000..58e975d Binary files /dev/null and b/FlashBack/Assets.xcassets/update.imageset/Regular-M (3).png differ diff --git a/FlashBack/Base.lproj/Main.storyboard b/FlashBack/Base.lproj/Main.storyboard index ed58ee0..4c016e5 100644 --- a/FlashBack/Base.lproj/Main.storyboard +++ b/FlashBack/Base.lproj/Main.storyboard @@ -1,9 +1,9 @@ - - + + - + @@ -13,139 +13,111 @@ - + - - - + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + + + + + + - + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -210,10 +241,16 @@ - + + + + + + + diff --git a/FlashBack/Info.plist b/FlashBack/Info.plist index c6f7481..753f7ea 100644 --- a/FlashBack/Info.plist +++ b/FlashBack/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.2 + $(MARKETING_VERSION) CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/FlashBack/ViewController.m b/FlashBack/ViewController.m index 300fd73..eb4c715 100644 --- a/FlashBack/ViewController.m +++ b/FlashBack/ViewController.m @@ -50,7 +50,7 @@ NSString *backupNameSelected; } else{ - UIAlertController *createBackupAlert = [UIAlertController alertControllerWithTitle:@"Enter the Backup Name" message:@"Please do not use special symbols. Use only letters and numbers, no spaces. If you have issues with the wallpaper not being properly applied after restoring to a backup, install autowall from\n https://jb365.github.io/" preferredStyle:UIAlertControllerStyleAlert]; + UIAlertController *createBackupAlert = [UIAlertController alertControllerWithTitle:@"Enter the Backup Name" message:@"Please do not use special symbols. Use only letters and numbers, no spaces." preferredStyle:UIAlertControllerStyleAlert]; [createBackupAlert addTextFieldWithConfigurationHandler:^(UITextField * _Nonnull textField) { textField.placeholder = @"Backup Name"; textField.secureTextEntry = NO; @@ -372,7 +372,7 @@ NSString *backupNameSelected; UIAlertController * tutorialAlert= [UIAlertController alertControllerWithTitle:@"Help" - message:@"Create Backup: This will prompt you to enter a name for the backup which will be displayed in the box above.\n\nRestore: This will revert your settings, wallpaper, and Icon Layout to the selected setup.\n\nUpdate: This will overwrite the selected backup to cleanly update it.\n\nPackage: This will generate a package in DEB format for you to share or back up for later, including installed tweaks.\n\nDelete: This will delete the selected backup. These backups cannot be recovered!" + message:@"Create Backup (+): This will prompt you to enter a name for the backup which will be displayed in the box above.\n\nRestore (↺): This will revert your settings, wallpaper, and Icon Layout to the selected setup.\n\nUpdate (↑↓): This will overwrite the selected backup to cleanly update it.\n\nPackage (File Icon): This will generate a package in DEB format for you to share or back up for later, including installed tweaks.\n\nDelete (Trash Icon): This will delete the selected backup. These backups cannot be recovered!" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction* ok = [UIAlertAction @@ -385,7 +385,7 @@ NSString *backupNameSelected; UIAlertController * infoAlert= [UIAlertController alertControllerWithTitle:@"Known issues" - message:@"\nFor bug reports, please contact me via Twitter or the email available in the next pop-up dialogue.\n\nCredit for the DRM goes to @kushdabush on twitter" + message:@"\nFor bug reports, please contact me via Twitter or the email available in the next pop-up dialogue.\n\nIf you have issues with the wallpaper, apply your wallpaper with AutoWall from https://jb365.github.io/ and update the backup.\n\nCredit for the DRM goes to @kushdabush on twitter" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction* okay = [UIAlertAction @@ -533,7 +533,6 @@ NSString *backupNameSelected; // MARK: DRM From @Kushdabush, commenting out for testing //pulled from https://github.com/DomienF/kushy-drm/blob/master/Tweak.xm - /* UIAlertController * failedDRMAlert= [UIAlertController alertControllerWithTitle:@"FlashBack appears to be pirated :(" @@ -546,7 +545,7 @@ NSString *backupNameSelected; handler:^(UIAlertAction * action) { [failedDRMAlert dismissViewControllerAnimated:YES completion:nil]; - //exit(0); + exit(0); }]; UIAlertController * trialNoticeAlert= [UIAlertController @@ -584,7 +583,6 @@ NSString *backupNameSelected; }); } } - */ trial = NO; } @@ -596,7 +594,7 @@ NSString *backupNameSelected; UIAlertController * emptyArrayAlert= [UIAlertController alertControllerWithTitle:@"Let's start by making a backup!" - message:@"Press 'Create Backup' to get started!" + message:@"Press 'Create Backup (+)' to get started!" preferredStyle:UIAlertControllerStyleAlert]; UIAlertAction* ok = [UIAlertAction