new icon

librx/BaiscTabBarController.swift

@@ -16,7 +16,6 @@ class BaiscTabBarController: UITabBarController {
         UIToolbar.appearance().tintColor = UIColor.blackColor()
         UIToolbar.appearance().backgroundColor = UIColor.whiteColor()
         self.tabBar.backgroundColor = UIColor.whiteColor()
-        
     }
     
 }

librx/Base.lproj/Main.storyboard

@@ -471,8 +471,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <webView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="K9E-O0-MUZ">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
+                            <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K9E-O0-MUZ">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <animations/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             </webView>
@@ -1512,8 +1512,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <webView contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FB1-8L-lYa">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="551"/>
+                            <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FB1-8L-lYa">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <color key="backgroundColor" red="0.36078431370000003" green="0.38823529410000002" blue="0.4039215686" alpha="1" colorSpace="deviceRGB"/>
                             </webView>
                         </subviews>

librx/Images.xcassets/Bookmark.imageset/Contents.json

@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "Bookmark-1.png",
+      "filename" : "Bookmark-32.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Bookmark@2x.png",
+      "filename" : "Bookmark-50.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "Bookmark@3x.png",
+      "filename" : "Bookmark-100.png",
       "scale" : "3x"
     }
   ],

librx/Images.xcassets/BookmarkFilled.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "BookmarkFilled.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "BookmarkFilled@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "BookmarkFilled@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

librx/Images.xcassets/Like.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "Like.png"
+      "filename" : "Like-50 (1)-1.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "Like@2x.png"
+      "filename" : "Like-50 (1).png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "Like@3x.png"
+      "filename" : "Like-100 (1).png",
+      "scale" : "3x"
     }
   ],
   "info" : {

librx/Images.xcassets/LikeEmpty.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "LikeEmpty.png"
+      "filename" : "LikeEmpty.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "LikeEmpty@2x.png"
+      "filename" : "LikeEmpty@2x.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "LikeEmpty@3x.png"
+      "filename" : "LikeEmpty@3x.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

librx/Images.xcassets/Plus.imageset/Contents.json

@@ -2,18 +2,18 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "Plus.png"
+      "filename" : "Plus Math-32.png",
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x",
-      "filename" : "Plus@2x.png"
+      "filename" : "Plus Math-50.png",
+      "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "scale" : "3x",
-      "filename" : "Plus@3x.png"
+      "filename" : "Plus Math-100.png",
+      "scale" : "3x"
     }
   ],
   "info" : {

librx/LibrxService.swift

@@ -191,7 +191,6 @@ struct LibrxService {
                     if !json.isEmpty {
                         for index in 0..<json.count {
                             let postData = json[index]
-                            print(postData)
                             let post: Post = JsonPaser.parsePost(postData)
                             posts.append(post)
                         }
@@ -290,7 +289,6 @@ struct LibrxService {
         Alamofire.request(.POST, urlString, parameters: parameters).response { (req, res, data, error) -> Void in
             
             let json = JSON(data: data!)
-            print(json)
             handleUserInfo(json, response: response)
             
         }

librx/LocalStore.swift

@@ -19,6 +19,7 @@ struct LocalStore {
         if let _share = userDefaults {
            // _share.setObject(posts, forKey: postCacheKey)
            // _share.synchronize()
+            print("do nothing.")
         }
     }
     

librx/WebViewController.swift

@@ -94,7 +94,7 @@ class WebViewController: UIViewController {
             self.isBookMarkPost = false
         }else {
             LibrxService.bookmarkPost(self.post.id)
-            self.bookmarkButton.image = UIImage(named: "Like")
+            self.bookmarkButton.image = UIImage(named: "BookmarkFilled")
             self.isBookMarkPost = true
         }
         

libxShareExt/ShareViewController.swift

@@ -26,7 +26,6 @@ class ShareViewController: SLComposeServiceViewController {
                         if let results = list as? NSDictionary {
                             NSOperationQueue.mainQueue().addOperationWithBlock {
                                 // We don't actually care about this...
-                                print(results)
                                 self.itemLoadCompletedWithPreprocessingResults(results["NSExtensionJavaScriptPreprocessingResultsKey"] as! NSDictionary)
                             }
                         }
@@ -39,10 +38,9 @@ class ShareViewController: SLComposeServiceViewController {
     func itemLoadCompletedWithPreprocessingResults(javaScriptPreprocessingResults: NSDictionary) {
         if let text = javaScriptPreprocessingResults["baseURI"] as? String {
             let userDefaults = NSUserDefaults.init(suiteName: "group.librme")
-            print(">>>>>\(userDefaults!.integerForKey("accessTokenKey"))")
-            userDefaults!.setValue(text, forKey: "note")
-            userDefaults!.synchronize()
-            //self.doneWithResults(["message": "Successfully added to the note app"])
+            print(">>>>>\(userDefaults!.integerForKey("accessTokenKey"))\n")
+            print("share url\(text)\n")
+            self.doneWithResults(["message": "Successfully added to the note app"])
         }
     }