Merge pull request #2148 from RocketChat/develop

[RELEASE] Merge DEVELOP into BETA

Author: rafaelks

Podfile

@@ -13,6 +13,10 @@ def ui_pods
   pod 'MBProgressHUD', '~> 1.1.0'
 end
 
+def diff_pods
+  pod 'DifferenceKit'
+end
+
 def shared_pods
   # Analytics
   pod 'Firebase/Core'
@@ -28,6 +32,7 @@ def shared_pods
   pod 'SlackTextViewController', :git => 'https://github.com/rafaelks/SlackTextViewController.git'
   pod 'MobilePlayer', :git => 'https://github.com/RocketChat/RCiOSMobilePlayer'
   pod 'SimpleImageViewer', :git => 'https://github.com/cardoso/SimpleImageViewer.git'
+  pod 'SwipeCellKit'
   ui_pods
 
   # Text Processing
@@ -49,12 +54,16 @@ def shared_pods
   # Debugging
   pod 'SwiftLint', :configurations => ['Debug']
   pod 'FLEX', '~> 2.0', :configurations => ['Debug', 'Beta']
+
+  # Diffing
+  diff_pods
 end
 
 target 'Rocket.Chat.ShareExtension' do
   pod 'Nuke-FLAnimatedImage-Plugin'
   database_pods
   ui_pods
+  diff_pods
 end
 
 target 'Rocket.Chat' do
@@ -68,7 +77,7 @@ target 'Rocket.ChatTests' do
 end
 
 post_install do |installer|
-  swift4Targets = ['OAuthSwift', 'TagListView', 'SearchTextField', 'Nuke', 'Nuke-FLAnimatedImage-Plugin']
+  swift4Targets = ['OAuthSwift', 'TagListView', 'SearchTextField', 'Nuke', 'Nuke-FLAnimatedImage-Plugin', 'DifferenceKit', 'SwipeCellKit']
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
       config.build_settings['SWIFT_VERSION'] = '3.1'

Podfile.lock

@@ -2,18 +2,24 @@ PODS:
   - 1PasswordExtension (1.8.5)
   - Crashlytics (3.10.5):
     - Fabric (~> 1.7.9)
+  - DifferenceKit (0.5.2):
+    - DifferenceKit/Core (= 0.5.2)
+    - DifferenceKit/UIExtensions (= 0.5.2)
+  - DifferenceKit/Core (0.5.2)
+  - DifferenceKit/UIExtensions (0.5.2):
+    - DifferenceKit/Core
   - Fabric (1.7.9)
-  - Firebase/Core (5.4.0):
+  - Firebase/Core (5.4.1):
     - Firebase/CoreOnly
     - FirebaseAnalytics (= 5.0.1)
-  - Firebase/CoreOnly (5.4.0):
-    - FirebaseCore (= 5.0.5)
+  - Firebase/CoreOnly (5.4.1):
+    - FirebaseCore (= 5.0.6)
   - FirebaseAnalytics (5.0.1):
     - FirebaseCore (~> 5.0)
     - FirebaseInstanceID (~> 3.0)
     - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
     - nanopb (~> 0.3)
-  - FirebaseCore (5.0.5):
+  - FirebaseCore (5.0.6):
     - "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
   - FirebaseInstanceID (3.1.1):
     - FirebaseCore (~> 5.0)
@@ -29,29 +35,31 @@ PODS:
     - nanopb/encode (= 0.3.8)
   - nanopb/decode (0.3.8)
   - nanopb/encode (0.3.8)
-  - Nuke (7.3)
+  - Nuke (7.3.2)
   - Nuke-FLAnimatedImage-Plugin (5.0):
     - FLAnimatedImage (~> 1.0)
     - Nuke (~> 7.0)
   - OAuthSwift (1.2.2)
   - RCMarkdownParser (3.0.6)
   - ReachabilitySwift (4.1.0)
-  - Realm (3.7.4):
-    - Realm/Headers (= 3.7.4)
-  - Realm/Headers (3.7.4)
-  - RealmSwift (3.7.4):
-    - Realm (= 3.7.4)
+  - Realm (3.7.5):
+    - Realm/Headers (= 3.7.5)
+  - Realm/Headers (3.7.5)
+  - RealmSwift (3.7.5):
+    - Realm (= 3.7.5)
   - semver (1.1.0)
   - SimpleImageViewer (1.2.0):
     - FLAnimatedImage
   - SlackTextViewController (1.9.6)
   - Starscream (2.1.1)
   - SwiftLint (0.26.0)
   - SwiftyJSON (4.1.0)
+  - SwipeCellKit (2.4.3)
 
 DEPENDENCIES:
   - 1PasswordExtension
   - Crashlytics
+  - DifferenceKit
   - Fabric
   - Firebase/Core
   - FLEX (~> 2.0)
@@ -69,11 +77,13 @@ DEPENDENCIES:
   - Starscream (~> 2)
   - SwiftLint
   - SwiftyJSON
+  - SwipeCellKit
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - 1PasswordExtension
     - Crashlytics
+    - DifferenceKit
     - Fabric
     - Firebase
     - FirebaseAnalytics
@@ -94,6 +104,7 @@ SPEC REPOS:
     - Starscream
     - SwiftLint
     - SwiftyJSON
+    - SwipeCellKit
 
 EXTERNAL SOURCES:
   MobilePlayer:
@@ -110,7 +121,7 @@ CHECKOUT OPTIONS:
     :commit: c7160990d7b50d34a45514df4535011e64541340
     :git: https://github.com/RocketChat/RCiOSMobilePlayer
   RCMarkdownParser:
-    :commit: 43d99beabd1c39f8988d2e6631a46623b0116906
+    :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -122,31 +133,33 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
   Crashlytics: 7f2e38d302d9da96475b3d64d86fb29e31a542b7
+  DifferenceKit: 3999ddee5146dbd12d7418e2b907c6f5e2673805
   Fabric: a2917d3895e4c1569b9c3170de7320ea1b1e6661
-  Firebase: d66f4f29c23f22d96808d9abc174d81d8eee968f
+  Firebase: 355bd535bfdacaa82a7fe8d9784115edefd6fc03
   FirebaseAnalytics: b3628aea54c50464c32c393fb2ea032566e7ecc2
-  FirebaseCore: 42b3267233bd21a5abd54117ccc38ca3dd0f8e83
+  FirebaseCore: 4c28e3b9708ba48a765e76515f913a71596eb5dd
   FirebaseInstanceID: f3f0657372592ecdfdfe2cac604a5a75758376a6
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
   GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MobilePlayer: 069b13482499f14c25b6ce53f63a91e17975b073
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
-  Nuke: 3680b7186b18f84a5e9e283bfce4357bfd70fdf9
+  Nuke: a9a31bbd6c6723753ab024ef22057dcaaf046c1b
   Nuke-FLAnimatedImage-Plugin: 6dfb9335ce298eaff9fdfed8d20d1bbfb2a6c326
   OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
   RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
   ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
-  Realm: a469bb59e33f9926102ccaea4349822c53b9117e
-  RealmSwift: a45861b21c180f5cf0f122144b9759fa8dde3e9e
+  Realm: c286caf4dbf346ce24aad49ca76c7ce622d4a082
+  RealmSwift: 2a9281e37d6de55f66f76254d49d28aeb1b729e4
   semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
   SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
   SlackTextViewController: b854e62c1c156336bc4fd409c6ca79b5773e8f9d
   Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
   SwiftLint: f6b83e8d95ee1e91e11932d843af4fdcbf3fc764
   SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
+  SwipeCellKit: cee9906e6d3a36e22ad1a852fba7f8fa0839d113
 
-PODFILE CHECKSUM: e30b11fd34e7043eec6c9d2d0550e6e147670e19
+PODFILE CHECKSUM: 6702db159e15966472657eea05905247ba9622d9
 
 COCOAPODS: 1.5.3

README.md

@@ -1,13 +1,18 @@
-![Rocket.Chat logo](https://raw.githubusercontent.com/RocketChat/Rocket.Chat.Artwork/master/Logos/logo-dark.svg?sanitize=true)
+![](https://user-images.githubusercontent.com/551004/43643393-884b00a4-9701-11e8-94d8-14c46d1f3660.png)
 
+<p align="center" style="color: gray;">
+Take your conversations with you and never miss the action with our <br />iOS mobile app, with features including brand new UI with 3 themes, new ways to sort<br />and group conversations, and new onboarding experience
+</p>
 
-![Screenshot](https://user-images.githubusercontent.com/7317008/43209700-eb3ded88-904a-11e8-8ec4-9ac10a39f344.png)
+<br />
 
-<p align="center">
+![Screenshot](https://user-images.githubusercontent.com/551004/43643732-af17fab0-9702-11e8-819f-405afa7c6b64.png)
+
+<p align="center">  
   <a href=https://geo.itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8>
   <img alt="Download on the app store" src="https://user-images.githubusercontent.com/7317008/43209852-4ca39622-904b-11e8-8ce1-cdc3aee76ae9.png" width=160>
   </a>
- </p>
+</p>
 
 # Rocket.Chat iOS native application
 
@@ -40,6 +45,18 @@ Make sure your server supports WebSocket as well as SSL. Apache supports WebSock
 
 Are you an iOS developer and would like to help? Found a bug that you would like to report or a missing feature that you would like to request? Great! We have written down a [Contribution guide](https://github.com/RocketChat/Rocket.Chat.iOS/blob/develop/CONTRIBUTING.md) so you can start easily.
 
+# Themes ☀️🌙
+
+Choose from 3 new themes to take you from day to night.
+
+![Themes](https://user-images.githubusercontent.com/551004/43647513-35fea6d6-970e-11e8-9712-56e4b24e7a1b.png)
+
+# iPad
+
+We have developed an exclusive experience for iPad users: you can now multitask by using Rocket.Chat at the same time as other apps.
+
+![iPad](https://user-images.githubusercontent.com/551004/43647100-043903d6-970d-11e8-89c5-d7d677e26278.png)
+
 # Donate
 
 [![PayPal](https://camo.githubusercontent.com/f896f7d176663a1559376bb56aac4bdbbbe85ed1/68747470733a2f2f7777772e70617970616c6f626a656374732e636f6d2f656e5f55532f692f62746e2f62746e5f646f6e61746543435f4c472e676966)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZL94ZE6LGVUSN)

Rocket.Chat.ShareExtension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>203</string>
+	<string>207</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>

Rocket.Chat.ShareExtension/State/SEState.swift

@@ -42,14 +42,14 @@ struct SEState {
         let displayedRooms: [Subscription]
         switch searchRooms {
         case .none:
-            displayedRooms = rooms
+            displayedRooms = rooms.filter { $0.open }
         case .searching(let search):
             let search = search.lowercased()
             displayedRooms = rooms.filter {
                 $0.fname.lowercased().contains(search) || $0.name.lowercased().contains(search)
             }
         case .started:
-            displayedRooms = rooms
+            displayedRooms = rooms.filter { $0.open }
         }
         return displayedRooms.sorted(by: { $0.name < $1.name })
     }