- Re-added shuffle

- Fixed cached images loading

Author: illescasDaniel

Questions/AppDelegate.swift

@@ -36,25 +36,22 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 			navController?.navigationBar.prefersLargeTitles = true
 		}
 
-		if #available(iOS 9.0, *) {
-			
-			let readQRCode = UIMutableApplicationShortcutItem(type: ShortcutItemType.QRCode.rawValue,
-			                                                 localizedTitle: "Scan QR Code".localized,
-			                                                 localizedSubtitle: nil,
-			                                                 icon: UIApplicationShortcutIcon(templateImageName: "QRCodeIcon"))
-			
-			let darkTheme = UIMutableApplicationShortcutItem(type: ShortcutItemType.DarkTheme.rawValue,
-															 localizedTitle: "Dark Theme".localized,
-															 localizedSubtitle: nil,
-															 icon: UIApplicationShortcutIcon(templateImageName: "DarkThemeIcon"))
-			
-			let lightTheme = UIMutableApplicationShortcutItem(type: ShortcutItemType.LightTheme.rawValue,
-															 localizedTitle: "Light Theme".localized,
-															 localizedSubtitle: nil,
-															 icon: UIApplicationShortcutIcon(templateImageName: "LightThemeIcon"))
-			
-			application.shortcutItems = [readQRCode, darkTheme, lightTheme]
-		}
+		let readQRCode = UIMutableApplicationShortcutItem(type: ShortcutItemType.QRCode.rawValue,
+														 localizedTitle: "Scan QR Code".localized,
+														 localizedSubtitle: nil,
+														 icon: UIApplicationShortcutIcon(templateImageName: "QRCodeIcon"))
+		
+		let darkTheme = UIMutableApplicationShortcutItem(type: ShortcutItemType.DarkTheme.rawValue,
+														 localizedTitle: "Dark Theme".localized,
+														 localizedSubtitle: nil,
+														 icon: UIApplicationShortcutIcon(templateImageName: "DarkThemeIcon"))
+		
+		let lightTheme = UIMutableApplicationShortcutItem(type: ShortcutItemType.LightTheme.rawValue,
+														 localizedTitle: "Light Theme".localized,
+														 localizedSubtitle: nil,
+														 icon: UIApplicationShortcutIcon(templateImageName: "LightThemeIcon"))
+		
+		application.shortcutItems = [readQRCode, darkTheme, lightTheme]
 
 		AppDelegate.updateVolumeBarTheme()
 		VolumeBar.shared.start()

Questions/QuestionType.swift

@@ -30,3 +30,9 @@ extension QuestionType: Equatable {
 		return lhs.question == rhs.question && lhs.answers == rhs.answers && lhs.correctAnswers == rhs.correctAnswers
 	}
 }
+
+extension QuestionType: Hashable {
+	var hashValue: Int {
+		return question.hash
+	}
+}

Questions/QuestionsViewController.swift

@@ -59,11 +59,9 @@ class QuestionsViewController: UIViewController {
 		if self.isSetFromJSON {
 			self.goBack.isHidden = true
 		}
-		self.setUpQuiz()
 
-		DispatchQueue.global().async {
-			self.preloadImages()
-		}
+		self.setUpQuiz()
+		self.preloadImages()
 
 		self.createAnswerButtons()
 
@@ -137,6 +135,9 @@ class QuestionsViewController: UIViewController {
 					}
 				})
 			}
+			else {
+				// TODO: complete!
+			}
 		}
 	}
 
@@ -363,9 +364,7 @@ class QuestionsViewController: UIViewController {
 
 		for fullQuestion in self.set.dropFirst() { // Drops the first because it will be cached by the 'pickQuestion()' function
 
-			guard let validImageURL = fullQuestion.imageURL else { break }
-			
-			print(validImageURL)
+			guard let validImageURL = fullQuestion.imageURL else { continue }
 
 			CachedImages.shared.saveImage(withURL: validImageURL, onError: { cachedImagesError in
 				switch cachedImagesError {
@@ -465,7 +464,6 @@ class QuestionsViewController: UIViewController {
 		}
 	}
 
-	private var currentURL: URL? = nil
 	public func pickQuestion() {
 
 		if self.currentQuizOfTopic.options?.multipleCorrectAnswersAsMandatory ?? false {
@@ -615,7 +613,7 @@ class QuestionsViewController: UIViewController {
 		if !self.isSetFromJSON { self.set = SetOfTopics.shared.currentTopics[currentTopicIndex].quiz.sets[currentSetIndex] }
 
 		if self.currentQuizOfTopic.options?.questionsInRandomOrder ?? true {
-			//self.set.shuffle()
+			self.set.shuffle()
 		}
 		self.quiz = self.set.enumerated().makeIterator()
 	}