Save AsyncTextAttachment rounded image separately, Fixed bug in SettingsTheme, Fixed iOS 12 rotation crash

Author: ccrama

Slide for Reddit.xcodeproj/xcshareddata/xcschemes/Slide for Apple Watch.xcscheme

@@ -65,33 +65,46 @@
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES"
       notificationPayloadFile = "Slide for Apple Watch Extension/PushNotificationPayload.apns">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/$(USR_DISPLAY_NAME)">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BE20851021588F3900D8F33C"
             BuildableName = "Slide for Apple Watch.app"
             BlueprintName = "Slide for Apple Watch"
             ReferencedContainer = "container:Slide for Reddit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.Carousel"
+         RemotePath = "/$(USR_DISPLAY_NAME)">
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "BE20851021588F3900D8F33C"
             BuildableName = "Slide for Apple Watch.app"
             BlueprintName = "Slide for Apple Watch"
             ReferencedContainer = "container:Slide for Reddit.xcodeproj">
          </BuildableReference>
-      </BuildableProductRunnable>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "BE20851021588F3900D8F33C"
+            BuildableName = "Slide for Apple Watch.app"
+            BlueprintName = "Slide for Apple Watch"
+            ReferencedContainer = "container:Slide for Reddit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Slide for Reddit/AsyncTextAttachment.swift

@@ -84,14 +84,14 @@ public class AsyncTextAttachment: NSTextAttachment {
     }
 
     private func getCacheImage(with: URL) -> UIImage? {
-        return SDImageCache.shared.imageFromCache(forKey: with.absoluteString)
+        return SDImageCache.shared.imageFromCache(forKey: with.absoluteString + "-round")
     }
 
     private func downloadImage(with: URL) {
         SDWebImageDownloader.shared.downloadImage(with: with, options: [.decodeFirstFrameOnly], progress: nil) { (image, data, _, _) in
             let roundedImage = image?.circleCorners(finalSize: self.bounds.size)
             DispatchQueue.global(qos: .background).async {
-                SDImageCache.shared.storeImage(toMemory: roundedImage, forKey: with.absoluteString)
+                SDImageCache.shared.storeImage(toMemory: roundedImage, forKey: with.absoluteString + "-round")
             }
 
             self.display(roundedImage, with: data, url: with)

Slide for Reddit/NavigationHomeViewController.swift

@@ -568,10 +568,10 @@ extension NavigationHomeViewController: UITableViewDelegate, UITableViewDataSour
         } else {
             let thing: String
             if isSearching {
-                print(users)
-                print(suggestions)
-                print(indexPath.row)
                 if (indexPath.row > suggestions.count - 1 || suggestions.count == 0) && users.count > 0 {
+                    if users.count > indexPath.row - suggestions.count {
+                        
+                    }
                     thing = users[indexPath.row - suggestions.count]
                     let c = tableView.dequeueReusableCell(withIdentifier: "sub", for: indexPath) as! SubredditCellView
                     c.setProfile(profile: thing, nav: self)

Slide for Reddit/PostActions.swift

@@ -92,13 +92,17 @@ class PostActions: NSObject {
 
             parent.present(activityViewController, animated: true, completion: nil)
         case .CHROME:
-            let open = OpenInChromeController.init()
-            open.openInChrome(link.url!, callbackURL: nil, createNewTab: true)
+            if link.url != nil {
+                let open = OpenInChromeController.init()
+                open.openInChrome(link.url!, callbackURL: nil, createNewTab: true)
+            }
         case .SAFARI:
-            if #available(iOS 10.0, *) {
-                UIApplication.shared.open(link.url!, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
-            } else {
-                UIApplication.shared.openURL(link.url!)
+            if link.url != nil {
+                if #available(iOS 10.0, *) {
+                    UIApplication.shared.open(link.url!, options: convertToUIApplicationOpenExternalURLOptionsKeyDictionary([:]), completionHandler: nil)
+                } else {
+                    UIApplication.shared.openURL(link.url!)
+                }
             }
         case .FILTER:
             delegate.showFilterMenu(cell)

Slide for Reddit/SettingsTheme.swift

@@ -82,7 +82,7 @@ class SettingsTheme: BubbleSettingTableViewController, ColorPickerViewDelegate {
         } else {
             let alertController = UIAlertController(title: "\n\n\n\n\n\n\n\n", message: nil, preferredStyle: UIAlertController.Style.actionSheet)
             let margin: CGFloat = 10.0
-            let rect = CGRect(x: margin, y: margin, width: UIScreen.main.traitCollection.userInterfaceIdiom == .pad ? 314 - margin * 4.0: alertController.view.bounds.size.width - margin * 4.0, height: 150)
+            let rect = CGRect(x: margin, y: margin, width: UIScreen.main.traitCollection.userInterfaceIdiom == .pad ? 314 - margin * 4.0: UIScreen.main.bounds.size.width - margin * 4.0, height: 150)
             let MKColorPicker = ColorPickerView.init(frame: rect)
             MKColorPicker.delegate = self
             MKColorPicker.colors = GMPalette.allColor()
@@ -125,10 +125,18 @@ class SettingsTheme: BubbleSettingTableViewController, ColorPickerViewDelegate {
                 presenter.sourceRect = selectedTableView.bounds
             }
 
-            present(alertController, animated: false, completion: nil)
+            UIApplication.shared.keyWindow?.rootViewController?.present(alertController, animated: true, completion: nil)
         }
     }
 
+    override func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section > 0 {
+            return 60
+        } else {
+            return UITableView.automaticDimension
+        }
+    }
+
     func redoThemes() {
         self.customThemes.removeAll()
         self.themes.removeAll()

Slide for Reddit/SingleSubredditViewController.swift

@@ -1502,7 +1502,7 @@ class SingleSubredditViewController: MediaViewController, AutoplayScrollViewDele
 
     func preloadImages(_ values: [RSubmission]) {
         var urls: [URL] = []
-        if !SettingValues.noImages && !(SettingValues.dataSavingDisableWiFi && LinkCellView.checkWiFi()) && SettingValues.dataSavingEnabled {
+        if (SettingValues.dataSavingEnabled && (SettingValues.dataSavingDisableWiFi && LinkCellView.checkWiFi()) && SettingValues.noImages) || !SettingValues.dataSavingEnabled {
             for submission in values {
                 var thumb = submission.thumbnail
                 var big = submission.banner

Slide for Reddit/SwipeForwardNavigationController.swift

@@ -235,7 +235,11 @@ extension SwipeForwardNavigationController {
             not14 = false
         }
         if let secondaryAsNav = secondaryViewController as? UINavigationController, (UIDevice.current.userInterfaceIdiom == .phone || not14) {
-            viewControllers += secondaryAsNav.viewControllers
+            for viewController in secondaryAsNav.viewControllers {
+                if !viewControllers.contains(viewController) {
+                    viewControllers.append(viewController)
+                }
+            }
         }
     }
 
@@ -255,25 +259,19 @@ extension SwipeForwardNavigationController {
 
 extension SwipeForwardNavigationController: UISplitViewControllerDelegate {
     func splitViewController(_ splitViewController: UISplitViewController, separateSecondaryFrom primaryViewController: UIViewController) -> UIViewController? {
-        var not14 = true
-        if #available(iOS 14, *) {
-            not14 = false
-        }
-        
-        return self //Disable left sidebar
-
-        /*if UIDevice.current.userInterfaceIdiom == .phone || not14 {
-            guard let primaryNavigation = primaryViewController as? UINavigationController else {
-              return nil
+        if #available(iOS 13, *) {
+            return self //Disable left sidebar
+        } else {
+            if UIDevice.current.userInterfaceIdiom == .phone {
+                guard let primaryNavigation = primaryViewController as? UINavigationController else {
+                  return nil
+                }
+                return decomposeStackForTransitionToRegular(primaryNavigation)
             }
-            
-            return decomposeStackForTransitionToRegular(primaryNavigation)
-
         }
-        return nil*/
+        return nil
     }
 
-    /* Unused
     func decomposeStackForTransitionToRegular(_ navigationController: UINavigationController) -> UIViewController? {
         var main: UIViewController?
         var newViewControllers = [UIViewController]()
@@ -299,7 +297,7 @@ extension SwipeForwardNavigationController: UISplitViewControllerDelegate {
             return SwipeForwardNavigationController(rootViewController: main)
         }
         return nil
-    } */
+    }
 }
 
 extension SwipeForwardNavigationController: UINavigationControllerDelegate {

Slide for Reddit/WebsiteViewController.swift

@@ -304,7 +304,7 @@ class WebsiteViewController: MediaViewController, WKNavigationDelegate {
     }
 
     func loadUrl() {
-        if url?.host == "twitter.com" {
+        if url?.host == "twitter.com" && UIDevice.current.userInterfaceIdiom == .pad {
             webView.customUserAgent = "Googlebot/2.1 (+http://www.google.com/bot.html)"
         }
         let myURLRequest: URLRequest = URLRequest(url: url!)