More Apple Watch improvements, Add Read Later support

Author: ccrama

Slide for Apple Watch Extension/InterfaceController.swift

@@ -116,12 +116,13 @@ class InterfaceController: Votable {
     }
 
     func loadData(_ session: WCSession) {
+        print("Heartbeat")
         if session.isReachable && session.activationState == .activated {
             checkTimer?.invalidate()
             checkTimer = nil
         } else if checkTimer == nil {
             checkTimer = Timer.scheduledTimer(withTimeInterval: 1, repeats: true, block: { (_) in
-                self.loadData(WCSession.default)
+                self.loadData(session)
             })
             return
         } else {

Slide for Apple Watch Extension/PostActionMenuController.swift

@@ -21,10 +21,12 @@ class PostActionMenuController: Votable {
     public var parent: InterfaceController?
     @IBOutlet var thumbImage: WKInterfaceImage!
     @IBOutlet var thumbGroup: WKInterfaceGroup!
+    @IBOutlet var readlater: WKInterfaceButton!
     @IBOutlet var upvoteButton: WKInterfaceButton!
     @IBOutlet var downvoteButton: WKInterfaceButton!
     @IBOutlet var linkInfo: WKInterfaceLabel!
     var id: String?
+    var sub: String?
     @IBAction func didUpvote() {
         (WKExtension.shared().visibleInterfaceController as? Votable)?.sharedUp = upvoteButton
         (WKExtension.shared().visibleInterfaceController as? Votable)?.sharedDown = downvoteButton
@@ -36,6 +38,11 @@ class PostActionMenuController: Votable {
         (WKExtension.shared().visibleInterfaceController as? Votable)?.doVote(id: id!, upvote: false, downvote: true)
     }
 
+    @IBAction func didSaveLater() {
+        (WKExtension.shared().visibleInterfaceController as? Votable)?.sharedReadLater = readlater
+        (WKExtension.shared().visibleInterfaceController as? Votable)?.doReadLater(id: id!, sub: sub!)
+    }
+
     @IBAction func openComments() {
 //        if !(self.parent?.isPro ?? true) {
 //            self.parent?.presentController(withName: "Pro", context: parent!)
@@ -89,9 +96,11 @@ class PostActionMenuController: Votable {
 
         upvoteButton.setBackgroundColor((myModel.dictionary["upvoted"] ?? false) as! Bool ? UIColor.init(hexString: "#FF5700") : UIColor.gray)
         downvoteButton.setBackgroundColor((myModel.dictionary["downvoted"] ?? false) as! Bool ? UIColor.init(hexString: "#9494FF") : UIColor.gray)
+        readlater.setBackgroundColor((myModel.dictionary["readLater"] ?? false) as! Bool ? UIColor.init(hexString: "#4CAF50") : UIColor.gray)
 
         scoreLabel.setText(myModel.scoreText)
         id = myModel.id
+        sub = myModel.sub
         commentLabel.setText(myModel.commentText)
         WCSession.default.sendMessage(["comments": myModel.id!], replyHandler: { (message) in
             self.comments = message["comments"] as? [NSDictionary] ?? []

Slide for Apple Watch Extension/SubmissionRowController.swift

@@ -47,6 +47,8 @@ public class SubmissionRowController: NSObject {
     }
 
     @IBAction func didSaveLater() {
+        (WKExtension.shared().visibleInterfaceController as? Votable)?.sharedReadLater = readlater
+        (WKExtension.shared().visibleInterfaceController as? Votable)?.doReadLater(id: id!, sub: sub!)
     }
 
     func setData(dictionary: NSDictionary, color: UIColor) {
@@ -145,7 +147,8 @@ public class SubmissionRowController: NSObject {
         default:
             text = "Link"
         }
-        
+
+        readlater.setBackgroundColor((dictionary["readLater"] ?? false) as! Bool ? UIColor.init(hexString: "#4CAF50") : UIColor.gray)
         upvote.setBackgroundColor((dictionary["upvoted"] ?? false) as! Bool ? UIColor.init(hexString: "#FF5700") : UIColor.gray)
         downvote.setBackgroundColor((dictionary["downvoted"] ?? false) as! Bool ? UIColor.init(hexString: "#9494FF") : UIColor.gray)
         readlater.setBackgroundColor(UIColor.gray)

Slide for Apple Watch Extension/Votable.swift

@@ -13,6 +13,8 @@ import WatchKit
 class Votable: WKInterfaceController {
     weak var sharedUp: WKInterfaceButton?
     weak var sharedDown: WKInterfaceButton?
+    weak var sharedReadLater: WKInterfaceButton?
+    
     func doVote(id: String, upvote: Bool, downvote: Bool) {
         print("Doing vote")
         WCSession.default.sendMessage(["vote": id, "upvote": upvote, "downvote": downvote], replyHandler: { (result) in
@@ -23,6 +25,22 @@ class Votable: WKInterfaceController {
             } else {
                 WKInterfaceDevice.current().play(.failure)
             }
+            self.sharedUp = nil
+            self.sharedDown = nil
+        }, errorHandler: { (error) in
+            print(error)
+        })
+    }
+    
+    func doReadLater(id: String, sub: String) {
+        WCSession.default.sendMessage(["readlater": id, "sub": sub], replyHandler: { (result) in
+            if result["failed"] == nil {
+                WKInterfaceDevice.current().play(.success)
+                self.sharedReadLater?.setBackgroundColor((result["isReadLater"] ?? false) as! Bool ? UIColor.init(hexString: "#4CAF50") : UIColor.gray)
+            } else {
+                WKInterfaceDevice.current().play(.failure)
+            }
+            self.sharedReadLater = nil
         }, errorHandler: { (error) in
             print(error)
         })

Slide for Apple Watch/Base.lproj/Interface.storyboard

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="16095" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
+<document type="com.apple.InterfaceBuilder.WatchKit.Storyboard" version="3.0" toolsVersion="15505" targetRuntime="watchKit" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="AgC-eL-Hgc">
     <device id="watch38"/>
     <dependencies>
         <deployment identifier="watchOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16084.1"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="16012"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15509"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBWatchKitPlugin" version="15501"/>
     </dependencies>
     <scenes>
         <!--DetailView-->
@@ -49,10 +49,13 @@
                                 </label>
                             </items>
                         </group>
-                        <group width="114" alignment="center" spacing="20" id="0H8-4W-QOW">
+                        <group alignment="center" spacing="20" id="0H8-4W-QOW">
                             <items>
                                 <button width="25" height="25" alignment="left" backgroundImage="readLater" id="qt7-eH-tmW">
                                     <color key="titleColor" red="1" green="0.64263265049999996" blue="0.23978169960000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
+                                    <connections>
+                                        <action selector="didSaveLater" destination="lXM-Ia-ysh" id="CCa-BF-E9i"/>
+                                    </connections>
                                 </button>
                                 <button width="25" height="25" alignment="left" backgroundImage="upvote" id="5aK-kC-jcp">
                                     <color key="titleColor" red="1" green="0.64263265049999996" blue="0.23978169960000001" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
@@ -100,6 +103,7 @@
                         <outlet property="downvoteButton" destination="TB9-mU-nTN" id="84v-nV-s1E"/>
                         <outlet property="imageGroup" destination="UZW-Un-KSZ" id="pQL-zA-1E1"/>
                         <outlet property="linkInfo" destination="k9a-cP-5NH" id="F0Y-6Z-bam"/>
+                        <outlet property="readlater" destination="qt7-eH-tmW" id="Dpj-0S-sJi"/>
                         <outlet property="scoreLabel" destination="TtZ-h5-zAT" id="zQQ-Ug-haI"/>
                         <outlet property="thumbGroup" destination="lCG-GK-WZC" id="Ucv-Pu-mzg"/>
                         <outlet property="thumbImage" destination="VCe-ez-bLZ" id="TDg-wz-TD0"/>

Slide for Reddit/WatchSessionManager.swift

@@ -122,14 +122,23 @@ public class WatchSessionManager: NSObject, WCSessionDelegate {
                 replyHandler(["failed": true])
             }
         } else if message["readlater"] != nil {
-            ReadLater.addReadLater(id: message["readlater"] as! String, subreddit: message["sub"] as! String)
-            replyHandler([:])
+            DispatchQueue.main.async {
+                if ReadLater.isReadLater(id: message["readlater"] as! String) {
+                    ReadLater.removeReadLater(id: message["readlater"] as! String)
+                    replyHandler(["isReadLater": false])
+                } else {
+                    ReadLater.addReadLater(id: message["readlater"] as! String, subreddit: message["sub"] as! String)
+                    replyHandler(["isReadLater": true])
+                }
+            }
         } else if message["sublist"] != nil {
             var colorDict = [String: String]()
             var sublist = Subscriptions.pinned
             sublist.append(contentsOf: Subscriptions.subreddits)
             for sub in Subscriptions.subreddits {
-                colorDict[sub] = ColorUtil.getColorForSub(sub: sub).hexString()
+                if !sub.contains("m/") {
+                    colorDict[sub] = ColorUtil.getColorForSub(sub: sub).hexString()
+                }
             }
             replyHandler(["subs": colorDict, "orderedsubs": sublist, "pro": SettingValues.isPro])
         } else if message["links"] != nil {