Optomize & Clean Up Code

& Update to 1.0.2

README.md

@@ -30,11 +30,18 @@ To save videos: Triple tap on them and select "Save Video"
 
 ## History
 
-TODO: Write history
+#### 1.0.2
+* Fix ability to save Profile Pictures
+
+#### 1.0.1
+* Fix ability to save Poll images  
+
+#### 1.0.0
+* Initial Release  
 
 ## Credits
 
-Made by Gh0stByte
+Made by [Gh0stByte](http://twitter.com/Gh0stByte)
 
 Suggestion by /u/marcelre
 

Tweak.xm

@@ -35,240 +35,134 @@
 @property (assign, nonatomic) FLImageView *photoView;
 @end
 
-%hook FLHubPhotoViewController
+@interface FLFullScreenPhotoViewController : UIViewController
-
+@property (assign, nonatomic) UIImageView *imageView;
--(void)viewDidLoad
+@end
-{
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc]
-		initWithTarget:self 
-		action:@selector(handleLongPress:)];
-	longPress.minimumPressDuration = 1.5;
-	[self.view addGestureRecognizer:longPress];
-	%orig;
-}
-
-%new
--(void)handleLongPress:(UILongPressGestureRecognizer *)sender
-{
-	UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-
-        // Cancel button tappped.
-		[self dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Save Image" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-
-		UIImage *snapshot = self.imageView.originalImage;
-
-		[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^
-		{
-			PHAssetChangeRequest *changeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:snapshot];
-			changeRequest.creationDate          = [NSDate date];
-		} 
-		completionHandler:^(BOOL success, NSError *error) 
-		{
-			if (success) 
-			{
-				NSLog(@"successfully saved");
-			}
-			else 
-			{
-				NSLog(@"error saving to photos: %@", error);
-			}
-		}];
-
-		[self dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-    // Present action sheet.
-	[self presentViewController:actionSheet animated:YES completion:nil];
-}
-
-%end
-
 
 @interface FLPhotoDetailViewController : UIViewController
 @property (assign, nonatomic) FLImageView *photoView;
 @end
 
+
+// Save Image with UIImage and the Controller
+inline void requestSaveImage(UIImage *snapshot, UIViewController *sender) {
+
+	UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+
+	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
+		[sender dismissViewControllerAnimated:YES completion:^{		}];	}]];
+
+	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Save Image" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+		[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^
+		{
+			PHAssetChangeRequest *changeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:snapshot];
+			changeRequest.creationDate          = [NSDate date];
+		} 
+		completionHandler:^(BOOL success, NSError *error) 
+		{
+			if (success) 
+			{
+				NSLog(@"successfully saved");
+			}
+			else 
+			{
+				NSLog(@"error saving to photos: %@", error);
+			}
+		}];
+
+		[sender dismissViewControllerAnimated:YES completion:^{
+		}];
+	}]];
+	[sender presentViewController:actionSheet animated:YES completion:nil];
+}
+
+#define SETUP_LONGPRESS_ONCONTROLLER UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)]; longPress.minimumPressDuration = 1.5; [self.view addGestureRecognizer:longPress];
+
+// Media tab images
+%hook FLHubPhotoViewController
+
+-(void)viewDidLoad
+{
+	SETUP_LONGPRESS_ONCONTROLLER
+	%orig;
+}
+%new
+-(void)handleLongPress:(UILongPressGestureRecognizer *)sender
+{
+	requestSaveImage(self.imageView.originalImage, self);
+}
+
+%end
+
+//Normal Timeline Photos
 %hook FLPhotoDetailViewController
 
 -(void)viewDidLoad
 {
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc]
+	SETUP_LONGPRESS_ONCONTROLLER
-		initWithTarget:self 
-		action:@selector(handleLongPress:)];
-	longPress.minimumPressDuration = 1.5;
-	[self.view addGestureRecognizer:longPress];
 	%orig;
 }
 
-
-
 %new
 -(void)handleLongPress:(UILongPressGestureRecognizer *)sender
 {
-	UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+	requestSaveImage([self.photoView image], self);
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-
-        // Cancel button tappped.
-		[self dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Save Image" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-
-		UIImage *snapshot = [self.photoView image];
-
-		[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^
-		{
-			PHAssetChangeRequest *changeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:snapshot];
-			changeRequest.creationDate          = [NSDate date];
-		} 
-		completionHandler:^(BOOL success, NSError *error) 
-		{
-			if (success) 
-			{
-				NSLog(@"successfully saved");
-			}
-			else 
-			{
-				NSLog(@"error saving to photos: %@", error);
-			}
-		}];
-
-		[self dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-    // Present action sheet.
-	[self presentViewController:actionSheet animated:YES completion:nil];
 }
 
 %end
 
+//Collage Photos
 %hook FLCollageSinglePhotoViewController
 
 -(void)viewDidLoad
 {
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc]
+	SETUP_LONGPRESS_ONCONTROLLER
-		initWithTarget:self 
-		action:@selector(handleLongPress:)];
-	longPress.minimumPressDuration = 1.5;
-	[self.view addGestureRecognizer:longPress];
 	%orig;
 }
 
 %new
 -(void)handleLongPress:(UILongPressGestureRecognizer *)sender
 {
-	UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+	requestSaveImage(self.photoView.photoView.originalImage, self);
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-
-        // Cancel button tappped.
-		[self  dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Save Image" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-
-		UIImage *snapshot = self.photoView.photoView.originalImage;
-
-		[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^
-		{
-			PHAssetChangeRequest *changeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:snapshot];
-			changeRequest.creationDate          = [NSDate date];
-		} 
-		completionHandler:^(BOOL success, NSError *error) 
-		{
-			if (success) 
-			{
-				NSLog(@"successfully saved");
-			}
-			else 
-			{
-				NSLog(@"error saving to photos: %@", error);
-			}
-		}];
-
-		[self  dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-    // Present action sheet.
-	[self  presentViewController:actionSheet animated:YES completion:nil];
 }
 
 %end
 
-
+//Poll Images
 %hook FLPollSinglePhotoViewController
 
 -(void)viewDidLoad
 {
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc]
+	SETUP_LONGPRESS_ONCONTROLLER
-		initWithTarget:self 
-		action:@selector(handleLongPress:)];
-	longPress.minimumPressDuration = 1.5;
-	[self.view addGestureRecognizer:longPress];
 	%orig;
 }
 
 %new
 -(void)handleLongPress:(UILongPressGestureRecognizer *)sender
 {
-	UIAlertController *actionSheet = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+	requestSaveImage(self.photoView.originalImage, self);
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction *action) {
-
-        // Cancel button tappped.
-		[self  dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-	[actionSheet addAction:[UIAlertAction actionWithTitle:@"Save Image" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
-
-		UIImage *snapshot = self.photoView.originalImage;
-
-		[[PHPhotoLibrary sharedPhotoLibrary] performChanges:^
-		{
-			PHAssetChangeRequest *changeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:snapshot];
-			changeRequest.creationDate          = [NSDate date];
-		} 
-		completionHandler:^(BOOL success, NSError *error) 
-		{
-			if (success) 
-			{
-				NSLog(@"successfully saved");
-			}
-			else 
-			{
-				NSLog(@"error saving to photos: %@", error);
-			}
-		}];
-
-		[self  dismissViewControllerAnimated:YES completion:^{
-		}];
-	}]];
-
-    // Present action sheet.
-	[self  presentViewController:actionSheet animated:YES completion:nil];
 }
 
 %end
 
-// IGNORE ABOVE. SAVES IMAGES 
+//Profile Pictures
-//FLAVPlayerLayerView
+%hook FLFullScreenPhotoViewController
-//FLHubVideoCollection
-//FLVideoContentHolderVIew
 
+-(void)viewDidLoad
+{
+	SETUP_LONGPRESS_ONCONTROLLER
+	%orig;
+}
 
+%new
+-(void)handleLongPress:(UILongPressGestureRecognizer *)sender
+{
+	requestSaveImage(self.imageView.image, self);
+}
+
+%end
+
+//Saves Videos
 %hook FLPostCollectionViewCell
 
 -(void)setPostView:(FLBaseContentHolderView *)holderView

control

@@ -1,7 +1,7 @@
 Package: gg.gh0stbyte.bkstg
 Name: Bkstg Plus
 Depends: mobilesubstrate
-Version: 1.0.0
+Version: 1.0.2
 Architecture: iphoneos-arm
 Description: Save Media from Bkstg
   Download photos & videos using this tweak. This tweak was suggested by /u/marcelre.