Fixed crash

Author: ccrama

Slide for Apple Watch Extension/InterfaceController.swift

@@ -26,6 +26,7 @@ class InterfaceController: WKInterfaceController {
     var page = 1
     var last = 0
     var currentSub = ""
+    var isPro = false
 
     override func willActivate() {
         // This method is called when watch view controller is about to be visible to user
@@ -105,7 +106,6 @@ class InterfaceController: WKInterfaceController {
 extension InterfaceController: WCSessionDelegate {
 
     func session(_ session: WCSession, didReceiveApplicationContext applicationContext: [String: Any]) {
-        print("Doing links")
         DispatchQueue.main.async {
             self.setTitle(applicationContext["title"] as? String)
             self.beginLoadingTable()
@@ -120,6 +120,7 @@ extension InterfaceController: WCSessionDelegate {
             session.sendMessage(["sublist": true], replyHandler: { (message) in
                 self.subs = message["subs"] as? [String: String] ?? [String: String]()
                 self.subsOrdered = message["orderedsubs"] as? [String] ?? [String]()
+                self.isPro = message["pro"] as? Bool ?? false
                 if self.subsOrdered.count > 0 {
                     self.getSubmissions(self.subsOrdered[0], reset: true)
                 }

Slide for Reddit/ContentListingViewController.swift

@@ -137,7 +137,9 @@ class ContentListingViewController: MediaViewController, UICollectionViewDelegat
 
     func collectionView(_ tableView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         if baseData.content.count == 0 {
-            return tableView.dequeueReusableCell(withReuseIdentifier: "nocontent", for: indexPath)
+            let cell = tableView.dequeueReusableCell(withReuseIdentifier: "nocontent", for: indexPath) as! NoContentCell
+            cell.doText(controller: self)
+            return cell
         }
         let thing = baseData.content[indexPath.row]
         var cell: UICollectionViewCell?
@@ -498,10 +500,15 @@ extension ContentListingViewController: LinkCellViewDelegate {
             ReadLater.removeReadLater(id: cell.link!.getId())
             let savedIndex = tableView.indexPath(for: cell)?.row ?? 0
             self.baseData.content.remove(at: savedIndex)
-            self.tableView.reloadData()
+            if self.baseData.content.count == 0 {
+                self.tableView.reloadData()
+            } else {
+                self.tableView.deleteItems(at: [IndexPath.init(row: savedIndex, section: 0)])
+            }
             BannerUtil.makeBanner(text: "Removed from Read Later", color: GMColor.red500Color(), seconds: 3, context: self, top: false) {
                 ReadLater.addReadLater(id: cell.link!.getId(), subreddit: cell.link!.subreddit)
                 self.baseData.content.insert(cell.link!, at: savedIndex)
+                self.tableView.insertItems(at: [IndexPath.init(row: savedIndex, section: 0)])
             }
         }
     }
@@ -516,17 +523,19 @@ public class NoContentCell: UICollectionViewCell {
         super.init(frame: frame)
         setupView()
     }
+    var title = UILabel()
 
     required public init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 
-    func setupView() {
-        let title = UILabel()
-        title.backgroundColor = ColorUtil.foregroundColor
-        title.textAlignment = .center
-        
-        let text = "Nothing to see here!\nNo content was found"
+    func doText(controller: ContentListingViewController){
+        let text: String
+        if controller is ReadLaterViewController {
+            text = "Nothing to see here!\nNo more posts to Read Later"
+        } else {
+            text = "Nothing to see here!\nNo content was found"
+        }
         let textParts = text.components(separatedBy: "\n")
 
         let finalText: NSMutableAttributedString!
@@ -539,6 +548,13 @@ public class NoContentCell: UICollectionViewCell {
             finalText = NSMutableAttributedString.init(string: text, attributes: [NSForegroundColorAttributeName: UIColor.white, NSFontAttributeName: UIFont.boldSystemFont(ofSize: 14)])
         }
         title.attributedText = finalText
+    }
+    
+    func setupView() {
+        title = UILabel()
+        title.backgroundColor = ColorUtil.foregroundColor
+        title.textAlignment = .center
+        
         title.numberOfLines = 0
         title.layer.cornerRadius = 15
         title.clipsToBounds = true

Slide for Reddit/LinkCellView.swift

@@ -921,6 +921,9 @@ class LinkCellView: UICollectionViewCell, UIViewControllerPreviewingDelegate, TT
             overView.layer.cornerRadius = 15
             overView.clipsToBounds = true
         }
+        if #available(iOS 10.0, *) {
+            HapticUtility.hapticActionStrong()
+        }
         typeImage.image = UIImage(named: SettingValues.submissionActionDoubleTap.getPhoto())?.getCopy(withSize: CGSize.square(size: 30), withColor: .white)
         typeImage.backgroundColor = SettingValues.submissionActionDoubleTap.getColor()
         contentView.addSubviews(typeImage, overView)
@@ -931,7 +934,7 @@ class LinkCellView: UICollectionViewCell, UIViewControllerPreviewingDelegate, TT
         typeImage.centerAnchors == self.contentView.centerAnchors
         typeImage.heightAnchor == 45
         typeImage.widthAnchor == 45
-        UIView.animate(withDuration: 0.3, delay: 0, options: .curveEaseInOut, animations: {
+        UIView.animate(withDuration: 0.5, delay: 0, options: .curveEaseInOut, animations: {
             self.typeImage.alpha = 0
             overView.alpha = 0
             self.typeImage.transform = CGAffineTransform(scaleX: 1.5, y: 1.5)

Slide for Reddit/SingleSubredditViewController.swift

@@ -2016,7 +2016,7 @@ extension SingleSubredditViewController: UICollectionViewDelegate {
     }
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
-        if indexPath.row == 0 && readLaterArticles > 0 && !loading && loaded {
+        if indexPath.row == 0 && readLaterArticles > 0 && loaded {
             VCPresenter.showVC(viewController: ReadLaterViewController(subreddit: sub) , popupIfPossible: false, parentNavigationController: self.navigationController, parentViewController: self)
         }
     }
@@ -2026,17 +2026,17 @@ extension SingleSubredditViewController: UICollectionViewDelegate {
 extension SingleSubredditViewController: UICollectionViewDataSource {
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return links.count + ((links.count != 0 && loaded) ? 1 : 0) + (readLaterArticles > 0 && !loading && loaded ? 1 : 0)
+        return links.count + ((links.count != 0 && loaded) ? 1 : 0) + (readLaterArticles > 0 && loaded ? 1 : 0)
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        if indexPath.row == 0 && readLaterArticles > 0 && !loading && loaded {
+        if indexPath.row == 0 && readLaterArticles > 0 && loaded {
             let cell = tableView.dequeueReusableCell(withReuseIdentifier: "readlater", for: indexPath) as! ReadLaterCell
             cell.setArticles(articles: self.readLaterArticles)
             return cell
         }
 
-        let row = indexPath.row - (readLaterArticles > 0 && !loading && loaded ? 1 : 0)
+        let row = indexPath.row - (readLaterArticles > 0 && loaded ? 1 : 0)
         if row >= self.links.count {
             let cell = tableView.dequeueReusableCell(withReuseIdentifier: "loading", for: indexPath) as! LoadingCell
             cell.loader.color = ColorUtil.fontColor
@@ -2165,10 +2165,10 @@ extension SingleSubredditViewController: ColorPickerViewDelegate {
 // MARK: - Wrapping Flow Layout Delegate
 extension SingleSubredditViewController: WrappingFlowLayoutDelegate {
     func collectionView(_ collectionView: UICollectionView, width: CGFloat, indexPath: IndexPath) -> CGSize {
-        if indexPath.row == 0 && readLaterArticles > 0 && !loading && loaded {
+        if indexPath.row == 0 && readLaterArticles > 0 && loaded {
             return CGSize(width: width, height: 60)
         }
-        let row = indexPath.row - (readLaterArticles > 0 && !loading && loaded ? 1 : 0)
+        let row = indexPath.row - (readLaterArticles > 0 && loaded ? 1 : 0)
         if row < links.count {
             let submission = links[row]
             if submission.author == "PAGE_SEPARATOR" {

Slide for Reddit/WatchSessionManager.swift

@@ -49,7 +49,7 @@ public class WatchSessionManager: NSObject, WCSessionDelegate {
             for sub in Subscriptions.subreddits {
                 colorDict[sub] = ColorUtil.getColorForSub(sub: sub).hexString
             }
-            replyHandler(["subs": colorDict, "orderedsubs": sublist])
+            replyHandler(["subs": colorDict, "orderedsubs": sublist, "pro": SettingValues.isPro])
         } else if message["links"] != nil {
             if message["reset"] as? Bool ?? true {
                 paginator = Paginator()