Added option Shuffle

.gitignore

@@ -0,0 +1,63 @@
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
+build/
+DerivedData
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+
+Pods/
+Podfile.lock
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
+
+fastlane/report.xml
+fastlane/screenshots
+
+#Liblinphone
+liblinphone-sdk/*
+
+#CocoaPods
+Pods
+Podfile.lock
+

WebViewScreenSaver/WVSSConfig.h

@@ -28,6 +28,7 @@
 @property(nonatomic, strong, readonly) NSMutableArray *addresses;
 @property(nonatomic, strong) NSString *addressListURL;
 @property(nonatomic, assign) BOOL shouldFetchAddressList;
+@property(nonatomic, assign) BOOL shufflePlaylist;
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults;
 - (void)synchronize;

WebViewScreenSaver/WVSSConfig.m

@@ -26,6 +26,7 @@
 static NSString * const kScreenSaverFetchURLsKey = @"kScreenSaverFetchURLs";  // BOOL
 static NSString * const kScreenSaverURLsURLKey = @"kScreenSaverURLsURL";  // NSString (URL)
 static NSString * const kScreenSaverURLListKey = @"kScreenSaverURLList";  // NSArray of NSDictionary
+static NSString * const kScreenSaverShufflePlaylist = @"kScreenSaverShufflePlaylist";
 
 
 @interface WVSSConfig ()
@@ -36,18 +37,19 @@ @interface WVSSConfig ()
 @implementation WVSSConfig
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults {
-  self = [super init];
-  if (self) {
-    self.userDefaults = userDefaults;
-
-    self.addresses = [self loadAddressesFromUserDefaults:userDefaults];
-    self.addressListURL = [userDefaults stringForKey:kScreenSaverURLsURLKey];
-    self.shouldFetchAddressList = [userDefaults boolForKey:kScreenSaverFetchURLsKey];
-
-    //NSLog(@"Loaded Addresses: %@", self.addresses);
-
-    if (!self.addresses) {
-      self.addresses = [NSMutableArray array];
+    self = [super init];
+    if (self) {
+        self.userDefaults = userDefaults;
+
+        self.addresses = [self loadAddressesFromUserDefaults:userDefaults];
+        self.addressListURL = [userDefaults stringForKey:kScreenSaverURLsURLKey];
+        self.shouldFetchAddressList = [userDefaults boolForKey:kScreenSaverFetchURLsKey];
+        self.shufflePlaylist = [userDefaults boolForKey:kScreenSaverShufflePlaylist];
+
+        //NSLog(@"Loaded Addresses: %@", self.addresses);
+
+        if (!self.addresses) {
+            self.addresses = [NSMutableArray array];
     }
   }
   return self;
@@ -79,16 +81,17 @@ - (void)saveAddressesToUserDefaults:(NSUserDefaults *)userDefaults {
 }
 
 - (void)synchronize {
-  [self saveAddressesToUserDefaults:self.userDefaults];
-  [self.userDefaults setBool:self.shouldFetchAddressList forKey:kScreenSaverFetchURLsKey];
-
-  if (self.addressListURL.length) {
-    [self.userDefaults setObject:self.addressListURL forKey:kScreenSaverURLsURLKey];
-  } else {
-    [self.userDefaults removeObjectForKey:kScreenSaverURLsURLKey];
-  }
-  [self.userDefaults synchronize];
-
+    [self saveAddressesToUserDefaults:self.userDefaults];
+    [self.userDefaults setBool:self.shouldFetchAddressList forKey:kScreenSaverFetchURLsKey];
+    [self.userDefaults setBool:self.shufflePlaylist forKey:kScreenSaverShufflePlaylist];
+
+    if (self.addressListURL.length) {
+        [self.userDefaults setObject:self.addressListURL forKey:kScreenSaverURLsURLKey];
+    } else {
+        [self.userDefaults removeObjectForKey:kScreenSaverURLsURLKey];
+    }
+    [self.userDefaults synchronize];
+
 }
 
 - (void)addAddressWithURL:(NSString *)url duration:(NSInteger)duration {

WebViewScreenSaver/WVSSConfigController.h

@@ -34,6 +34,7 @@
 @property(nonatomic, strong) IBOutlet NSTableView *urlTable;
 @property(nonatomic, strong) IBOutlet NSTextField *urlsURLField;
 @property(nonatomic, strong) IBOutlet NSButton *fetchURLCheckbox;
+@property(nonatomic, weak) IBOutlet NSButton *shuffleCheckbox;
 
 - (instancetype)initWithUserDefaults:(NSUserDefaults *)userDefaults;
 - (void)synchronize;
@@ -47,6 +48,7 @@
 
 - (IBAction)dismissConfigSheet:(id)sender;
 - (IBAction)toggleFetchingURLs:(id)sender;
+- (IBAction)toggleShuffle:(id)sender;
 - (IBAction)tableViewCellDidEdit:(id)sender;
 
 - (void)fetchAddresses;

WebViewScreenSaver/WVSSConfigController.m

@@ -66,6 +66,20 @@ - (void)appendSampleAddressIfEmpty {
 }
 
 - (NSArray *)addresses {
+
+    if (self.config.shufflePlaylist)
+    {
+        NSMutableArray *mutableArray = [self.config.addresses mutableCopy];
+        NSUInteger count = [mutableArray count];
+        if (count <= 1) return nil;
+
+        for (NSUInteger i = 0; i < count - 1; ++i) {
+            NSInteger remainingCount = count - i;
+            NSInteger exchangeIndex = i + arc4random_uniform((u_int32_t )remainingCount);
+            [mutableArray exchangeObjectAtIndex:i withObjectAtIndex:exchangeIndex];
+        }
+        return mutableArray;
+    }
   return self.config.addresses;
 }
 
@@ -167,6 +181,7 @@ - (NSWindow *)configureSheet {
 
     [self.fetchURLCheckbox setIntegerValue:self.config.shouldFetchAddressList];
     [self.urlsURLField setEnabled:self.config.shouldFetchAddressList];
+    self.shuffleCheckbox.integerValue = self.config.shufflePlaylist;
   }
   return self.sheet;
 }
@@ -257,7 +272,7 @@ - (BOOL)tableView:(NSTableView *)aTableView
   return YES;
 }
 
-#pragma mark -
+#pragma mark - Actions
 
 - (IBAction)tableViewCellDidEdit:(NSTextField *)textField {
   NSInteger col = [self.urlTable columnForView:textField];
@@ -283,5 +298,9 @@ - (IBAction)toggleFetchingURLs:(id)sender {
   [self.urlsURLField setEnabled:self.config.shouldFetchAddressList];
 }
 
+- (void)toggleShuffle:(id)sender {
+    self.config.shufflePlaylist = ! self.config.shufflePlaylist;
+    self.shuffleCheckbox.integerValue = self.config.shufflePlaylist;
+}
 
 @end

WebViewScreenSaver/WebViewScreenSaver.xcodeproj/project.pbxproj

@@ -307,7 +307,6 @@
 				TargetAttributes = {
 					641457061AEDC92100FB6CDF = {
 						CreatedOnToolsVersion = 6.1.1;
-						DevelopmentTeam = BPXMH69X9T;
 					};
 					641457181AEDC92200FB6CDF = {
 						CreatedOnToolsVersion = 6.1.1;
@@ -484,6 +483,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -529,6 +529,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;

WebViewScreenSaver/WebViewScreenSaver.xcodeproj/xcuserdata/serj.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>641457061AEDC92100FB6CDF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>641457181AEDC92200FB6CDF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>8D255AC50486D3F9007BF209</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>