Added option to select what to blur

Tweak.xm

@@ -41,11 +41,27 @@ static BOOL shuffleEnabled = NO;
 static BOOL perspectiveZoom = YES;
 static BOOL blurEnabled = NO;
 static int blurStrenght = 5;
+static int blurMode = 0;
 static BOOL interwallEnabled = NO;
 static int interwallTime = 60;
 
-static void SetWallpaper(UIImage *image)
+static void SetWallpaper(UIImage *image, int mode)
 {
+	PLStaticWallpaperImageViewController *wallpaperViewController = [[PLStaticWallpaperImageViewController alloc] initWithUIImage:image];
+	wallpaperViewController.saveWallpaperData = YES;
+
+	PLWallpaperMode wallMode = mode;
+	uintptr_t address = (uintptr_t)&wallMode;
+	object_setInstanceVariable(wallpaperViewController, "_wallpaperMode", *(PLWallpaperMode **)address);
+
+	[wallpaperViewController _savePhoto];
+	[wallpaperViewController release];
+}
+
+static void PrepareWallpaper(UIImage *image)
+{
+	UIImage *normalImage = image;
+
 	if (blurEnabled) {
 		CIFilter *gaussianBlurFilter = [CIFilter filterWithName:@"CIGaussianBlur"];
 		[gaussianBlurFilter setDefaults];
@@ -61,21 +77,45 @@ static void SetWallpaper(UIImage *image)
 		rect.size = image.size;
 
 		CGImageRef cgimg = [context createCGImage:outputImage fromRect:rect];
-		image = [UIImage imageWithCGImage:cgimg];
+		UIImage *blurredImage = [UIImage imageWithCGImage:cgimg];
 		CGImageRelease(cgimg);
-	}
 
-	PLStaticWallpaperImageViewController *wallpaperViewController = [[PLStaticWallpaperImageViewController alloc] initWithUIImage:image];
-	wallpaperViewController.saveWallpaperData = YES;
+		switch (blurMode) {
+			case 1:
+				if (wallpaperMode == 0) {
+					SetWallpaper(normalImage, 2);
+					SetWallpaper(blurredImage, 1);
+				} else if (wallpaperMode == 1) {
+					SetWallpaper(blurredImage, 1);
+				} else {
+					SetWallpaper(normalImage, 2);
+				}
 
-	uintptr_t address = (uintptr_t)&wallpaperMode;
-	object_setInstanceVariable(wallpaperViewController, "_wallpaperMode", *(PLWallpaperMode **)address);
+				break;
 
-	[wallpaperViewController _savePhoto];
-	[wallpaperViewController release];
+			case 2:
+				if (wallpaperMode == 0) {
+					SetWallpaper(normalImage, 1);
+					SetWallpaper(blurredImage, 2);
+				} else if (wallpaperMode == 2) {
+					SetWallpaper(blurredImage, 2);
+				} else {
+					SetWallpaper(normalImage, 1);
+				}
+
+				break;
+
+			default:
+				SetWallpaper(blurredImage, wallpaperMode);
+
+				break;
+		}
+	} else {
+		SetWallpaper(normalImage, wallpaperMode);
+	}
 }
 
-static void GetWallpapersFromAlbum()
+static void GetWallpaperFromAlbum()
 {
 	if (!assetsLibrary) {
 		assetsLibrary = [[ALAssetsLibrary alloc] init];
@@ -90,7 +130,7 @@ static void GetWallpapersFromAlbum()
 					if (index == currentIndex) {
 						ALAssetRepresentation *representation = [result defaultRepresentation];
 						UIImage *image = [UIImage imageWithCGImage:[representation fullScreenImage]];
-						SetWallpaper(image);
+						PrepareWallpaper(image);
 
 						if (shuffleEnabled) {
 							currentIndex = arc4random_uniform([group numberOfAssets]);
@@ -114,7 +154,7 @@ static void GetWallpapersFromAlbum()
 					if (index == currentIndex) {
 						ALAssetRepresentation *representation = [result defaultRepresentation];
 						UIImage *image = [UIImage imageWithCGImage:[representation fullScreenImage]];
-						SetWallpaper(image);
+						PrepareWallpaper(image);
 
 						if (shuffleEnabled) {
 							currentIndex = arc4random_uniform([group numberOfAssets]);
@@ -165,6 +205,10 @@ static void ReloadSettings()
 			blurStrenght = [[settings objectForKey:@"blur_strenght"] intValue];
 		}
 
+		if ([settings objectForKey:@"wallpaper_blur_options"]) {
+			blurMode = [[settings objectForKey:@"wallpaper_blur_options"] intValue];
+		}
+
 		if ([settings objectForKey:@"interwall_enabled"]) {
 			interwallEnabled = [[settings objectForKey:@"interwall_enabled"] boolValue];
 		}
@@ -192,6 +236,11 @@ static void ReloadSettings()
 	}
 
 	[settings release];
+
+	if (enabled && unlockedAfterBoot) {
+		currentIndex--;
+		GetWallpaperFromAlbum();
+	}
 }
 
 %hook SBLockScreenManager
@@ -201,7 +250,7 @@ static void ReloadSettings()
 	%orig;
 
 	if (enabled && unlockedAfterBoot) {
-		GetWallpapersFromAlbum();
+		GetWallpaperFromAlbum();
 	}
 }
 
@@ -232,7 +281,7 @@ static void ReloadSettings()
 %new - (void)updateWallpaper
 {
 	if (interwallEnabled && unlockedAfterBoot) {
-		GetWallpapersFromAlbum();
+		GetWallpaperFromAlbum();
 	}
 
 	[self configureTimer];
@@ -254,7 +303,7 @@ static void ReloadSettings()
 %ctor {
 	@autoreleasepool {
 		[[NSDistributedNotificationCenter defaultCenter] addObserverForName:@"WallmartEvent" object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notification) {
-			GetWallpapersFromAlbum();
+			GetWallpaperFromAlbum();
 		}];
 
 		ReloadSettings();

WallmartSettings/WallmartSettings.mm

@@ -69,7 +69,23 @@ - (id)specifiers
         [blur_strenght setProperty:@(40) forKey:@"max"];
         [blur_strenght setProperty:@(NO) forKey:@"showValue"];
 
-        _specifiers = [NSArray arrayWithObjects:firstGroup, blur_enabled, secondGroup, blur_strenght, nil];
+        PSSpecifier *thirdGroup = [PSSpecifier groupSpecifierWithName:@""];
+        [thirdGroup setProperty:@"These settings respect the default wallpaper mode settings." forKey:@"footerText"];
+
+        PSSpecifier *wallpaper_blur_options = [PSSpecifier preferenceSpecifierNamed:@"More options"
+                                                                             target:self
+                                                                                set:@selector(setValue:forSpecifier:)
+                                                                                get:@selector(getValueForSpecifier:)
+                                                                             detail:[PSListItemsController class]
+                                                                               cell:PSLinkListCell
+                                                                               edit:Nil];
+        [wallpaper_blur_options setIdentifier:@"wallpaper_blur_options"];
+        [wallpaper_blur_options setProperty:@(YES) forKey:@"enabled"];
+        [wallpaper_blur_options setValues:@[@(0), @(2), @(1)]
+                                   titles:@[@"Blur lockscreen and homescreen", @"Blur lockscreen only", @"Blur homescreen only"]
+                              shortTitles:@[@"Blur lockscreen and homescreen", @"Blur lockscreen only", @"Blur homescreen only"]];
+
+        _specifiers = [NSArray arrayWithObjects:firstGroup, blur_enabled, secondGroup, blur_strenght, thirdGroup, wallpaper_blur_options, nil];
     }
 
     return _specifiers;
@@ -99,6 +115,16 @@ - (id)getValueForSpecifier:(PSSpecifier *)specifier
         } else {
             return @(5);
         }
+    } else if ([specifier.identifier isEqualToString:@"wallpaper_blur_options"]) {
+        if (settings) {
+            if ([settings objectForKey:@"wallpaper_blur_options"]) {
+                return [settings objectForKey:@"wallpaper_blur_options"];
+            } else {
+                return @(0);
+            }
+        } else {
+            return @(0);
+        }
     }
 
     return nil;
@@ -115,6 +141,9 @@ - (void)setValue:(id)value forSpecifier:(PSSpecifier *)specifier
     } else if ([specifier.identifier isEqualToString:@"blur_strenght"]) {
         [settings setObject:value forKey:@"blur_strenght"];
         [settings writeToFile:settingsPath atomically:YES];
+    } else if ([specifier.identifier isEqualToString:@"wallpaper_blur_options"]) {
+        [settings setObject:value forKey:@"wallpaper_blur_options"];
+        [settings writeToFile:settingsPath atomically:YES];
     }
 
     CFNotificationCenterPostNotification(CFNotificationCenterGetDarwinNotifyCenter(), CFSTR("com.shinvou.wallmart/reloadSettings"), NULL, NULL, TRUE);

_/DEBIAN/control

@@ -5,5 +5,5 @@ Architecture: iphoneos-arm
 Description: Wallmart
 Author: Timm Kandziora
 Section: Tweaks
-Version: 1.7-1
+Version: 1.8-1
 Installed-Size: 644

control

@@ -1,7 +1,7 @@
 Package: com.shinvou.Wallmart
 Name: Wallmart
 Depends: mobilesubstrate
-Version: 1.7
+Version: 1.8
 Architecture: iphoneos-arm
 Description: Wallmart
 Author: Timm Kandziora