Merge pull request #2431 from RocketChat/beta

[RELEASE] Merge BETA into MASTER

.github/ISSUE_TEMPLATE.md

@@ -1,5 +1,3 @@
-Before writing an issue, please make sure you're talking about the native application (called Rocket.Chat+ in the App Store) and not the Cordova one (called Rocket.Chat in the App Store). If you are looking to open an issue to the Cordova application, go to this URL: https://github.com/RocketChat/Rocket.Chat.Cordova.
-
 - Your Rocket.Chat app version: ####
 - Your Rocket.Chat server version: ####
 - Device (or Simulator) you're running with: ####

.gitignore

@@ -41,7 +41,7 @@ xcshareddata
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
 #
-Pods/
+# Pods/
 
 # Carthage
 #

CONTRIBUTING.md

@@ -29,48 +29,11 @@ _(NOTE: Steps 3 and 4 must be executed from project's directory)_
 ```
 git clone https://github.com/RocketChat/Rocket.Chat.iOS
 ```
-2. Install [Bundler](https://bundler.io)
-```
-sudo gem install bundler
-```
-To update _Bundler_ (when there is new version available)
-```
-sudo gem update bundler
-```
-3. Install all gem dependencies
-```
-bundle install (sudo might be required in some cases)
-```
-To update all gem dependencies (usually executed by maintainer) run
-```
-bundle update
-```
-To update pod's repository (in case of having those oudated compared to Podfile.lock and in case of `pod install` failure)
-```
-bundle exec pod repo update
-```
-4. Download library dependencies using the cocoapods dependency manager (and update the same way):
-```
-bundle exec pod install
-```
-5. Do NOT open the Xcode project directly, instead use the Rocket.Chat.xcworkspace file to open the Xcode workspace.
-6. Build the project by ⌘ + R
+2. Use the Rocket.Chat.xcworkspace file to open the Xcode workspace.
+3. Build the project by ⌘ + R
 
 Also refer to [Guidelines](#project.pbxproj) for modifying files.
 
-#### Alternative
-
-You can skip installing Bundler (not recommended) and just install [CocoaPods](https://cocoapods.org/) (note that you will need to install at least Ruby 2.2.3 for this to work). Make sure you have correct version of CocoaPods installed or you might be not able to build project properly.
-```
-sudo gem install cocoapods
-```
-Then you can call all the cocoapods actions without **bundle exe** command.
-
-To update cocoapods (not that often needed, you will be notified during `pod install` when new version is available) run.
-```
-sudo gem update cocoapods
-```
-
 ## Issues needing help
 
 Didn't found a bug or want a new feature not already reported? Check out [the issues with "help wanted"](https://github.com/RocketChat/Rocket.Chat.iOS/labels/help%20wanted) or other issues, for those no branch exists.

Podfile

@@ -1,6 +1,6 @@
 source 'https://github.com/CocoaPods/Specs.git'
 
-platform :ios, '10.0'
+platform :ios, '11.0'
 use_frameworks!
 inhibit_all_warnings!
 
@@ -29,7 +29,7 @@ def shared_pods
   pod 'semver'
 
   # UI
-  pod 'SlackTextViewController', :git => 'https://github.com/rafaelks/SlackTextViewController.git'
+  pod 'RocketChatViewController', :git => 'https://github.com/RocketChat/RocketChatViewController'
   pod 'MobilePlayer', :git => 'https://github.com/RocketChat/RCiOSMobilePlayer'
   pod 'SimpleImageViewer', :git => 'https://github.com/cardoso/SimpleImageViewer.git'
   pod 'SwipeCellKit'
@@ -51,12 +51,12 @@ def shared_pods
   pod 'OAuthSwift'
   pod '1PasswordExtension'
 
+  # DiffKit
+  diff_pods
+
   # Debugging
   pod 'SwiftLint', :configurations => ['Debug']
   pod 'FLEX', '~> 2.0', :configurations => ['Debug', 'Beta']
-
-  # Diffing
-  diff_pods
 end
 
 target 'Rocket.Chat.ShareExtension' do
@@ -67,12 +67,10 @@ target 'Rocket.Chat.ShareExtension' do
 end
 
 target 'Rocket.Chat' do
-  # Shared pods
   shared_pods
 end
 
 target 'Rocket.ChatTests' do
-  # Shared pods
   shared_pods
 end
 

Podfile.lock

@@ -1,78 +1,91 @@
 PODS:
   - 1PasswordExtension (1.8.5)
-  - Crashlytics (3.10.7):
-    - Fabric (~> 1.7.11)
-  - DifferenceKit/Core (0.5.3)
-  - Fabric (1.7.11)
-  - Firebase/Core (5.8.0):
+  - Crashlytics (3.11.1):
+    - Fabric (~> 1.8.1)
+  - DifferenceKit (0.7.2):
+    - DifferenceKit/Core (= 0.7.2)
+    - DifferenceKit/UIKitExtension (= 0.7.2)
+  - DifferenceKit/Core (0.7.2)
+  - DifferenceKit/UIKitExtension (0.7.2):
+    - DifferenceKit/Core
+  - Fabric (1.8.2)
+  - Firebase/Core (5.12.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (= 5.1.2)
-  - Firebase/CoreOnly (5.8.0):
-    - FirebaseCore (= 5.1.3)
-  - FirebaseAnalytics (5.1.2):
+    - FirebaseAnalytics (= 5.3.0)
+  - Firebase/CoreOnly (5.12.0):
+    - FirebaseCore (= 5.1.7)
+  - FirebaseAnalytics (5.3.0):
     - FirebaseCore (~> 5.1)
-    - FirebaseInstanceID (~> 3.2)
-    - GoogleAppMeasurement (~> 5.1)
-    - GoogleUtilities/AppDelegateSwizzler (~> 5.2.0)
-    - GoogleUtilities/MethodSwizzler (~> 5.2.0)
+    - FirebaseInstanceID (~> 3.3)
+    - GoogleAppMeasurement (~> 5.3)
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
     - GoogleUtilities/Network (~> 5.2)
     - "GoogleUtilities/NSData+zlib (~> 5.2)"
     - nanopb (~> 0.3)
-  - FirebaseCore (5.1.3):
+  - FirebaseCore (5.1.7):
     - GoogleUtilities/Logger (~> 5.2)
-  - FirebaseInstanceID (3.2.1):
+  - FirebaseInstanceID (3.3.0):
     - FirebaseCore (~> 5.1)
-    - GoogleUtilities/Environment (~> 5.2)
+    - GoogleUtilities/Environment (~> 5.3)
+    - GoogleUtilities/UserDefaults (~> 5.3)
   - FLAnimatedImage (1.0.12)
   - FLEX (2.4.0)
-  - GoogleAppMeasurement (5.1.2):
-    - GoogleUtilities/AppDelegateSwizzler (~> 5.2.0)
-    - GoogleUtilities/MethodSwizzler (~> 5.2.0)
+  - GoogleAppMeasurement (5.3.0):
+    - GoogleUtilities/AppDelegateSwizzler (~> 5.2)
+    - GoogleUtilities/MethodSwizzler (~> 5.2)
     - GoogleUtilities/Network (~> 5.2)
     - "GoogleUtilities/NSData+zlib (~> 5.2)"
     - nanopb (~> 0.3)
-  - GoogleUtilities/AppDelegateSwizzler (5.2.3):
+  - GoogleUtilities/AppDelegateSwizzler (5.3.4):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (5.2.3)
-  - GoogleUtilities/Logger (5.2.3):
+  - GoogleUtilities/Environment (5.3.4)
+  - GoogleUtilities/Logger (5.3.4):
     - GoogleUtilities/Environment
-  - GoogleUtilities/MethodSwizzler (5.2.3):
+  - GoogleUtilities/MethodSwizzler (5.3.4):
     - GoogleUtilities/Logger
-  - GoogleUtilities/Network (5.2.3):
+  - GoogleUtilities/Network (5.3.4):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (5.2.3)"
-  - GoogleUtilities/Reachability (5.2.3):
+  - "GoogleUtilities/NSData+zlib (5.3.4)"
+  - GoogleUtilities/Reachability (5.3.4):
+    - GoogleUtilities/Logger
+  - GoogleUtilities/UserDefaults (5.3.4):
     - GoogleUtilities/Logger
   - MBProgressHUD (1.1.0)
   - MobilePlayer (1.2.0)
-  - nanopb (0.3.8):
-    - nanopb/decode (= 0.3.8)
-    - nanopb/encode (= 0.3.8)
-  - nanopb/decode (0.3.8)
-  - nanopb/encode (0.3.8)
-  - Nuke (7.3.2)
-  - Nuke-FLAnimatedImage-Plugin (5.0):
+  - nanopb (0.3.901):
+    - nanopb/decode (= 0.3.901)
+    - nanopb/encode (= 0.3.901)
+  - nanopb/decode (0.3.901)
+  - nanopb/encode (0.3.901)
+  - Nuke (7.5.1)
+  - Nuke-FLAnimatedImage-Plugin (6.0):
     - FLAnimatedImage (~> 1.0)
-    - Nuke (~> 7.0)
+    - Nuke (~> 7.5)
   - OAuthSwift (1.2.2)
   - RCMarkdownParser (3.0.6)
   - ReachabilitySwift (4.2.1)
-  - Realm (3.9.0):
-    - Realm/Headers (= 3.9.0)
-  - Realm/Headers (3.9.0)
-  - RealmSwift (3.9.0):
-    - Realm (= 3.9.0)
+  - Realm (3.12.0):
+    - Realm/Headers (= 3.12.0)
+  - Realm/Headers (3.12.0)
+  - RealmSwift (3.12.0):
+    - Realm (= 3.12.0)
+  - RocketChatViewController (0.1.0):
+    - RocketChatViewController/Composer (= 0.1.0)
+    - RocketChatViewController/ViewController (= 0.1.0)
+  - RocketChatViewController/Composer (0.1.0)
+  - RocketChatViewController/ViewController (0.1.0):
+    - DifferenceKit (~> 0.7.2)
   - semver (1.1.0)
   - SimpleImageViewer (1.2.0):
     - FLAnimatedImage
-  - SlackTextViewController (1.9.6)
   - Starscream (2.1.1)
   - SwiftLint (0.27.0)
-  - SwiftyJSON (4.1.0)
+  - SwiftyJSON (4.2.0)
   - SwipeCellKit (2.5.0)
 
 DEPENDENCIES:
@@ -90,9 +103,9 @@ DEPENDENCIES:
   - RCMarkdownParser (from `https://github.com/RocketChat/RCMarkdownParser.git`)
   - ReachabilitySwift
   - RealmSwift
+  - RocketChatViewController (from `https://github.com/RocketChat/RocketChatViewController`)
   - semver
   - SimpleImageViewer (from `https://github.com/cardoso/SimpleImageViewer.git`)
-  - SlackTextViewController (from `https://github.com/rafaelks/SlackTextViewController.git`)
   - Starscream (~> 2)
   - SwiftLint
   - SwiftyJSON
@@ -131,10 +144,10 @@ EXTERNAL SOURCES:
     :git: https://github.com/RocketChat/RCiOSMobilePlayer
   RCMarkdownParser:
     :git: https://github.com/RocketChat/RCMarkdownParser.git
+  RocketChatViewController:
+    :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :git: https://github.com/cardoso/SimpleImageViewer.git
-  SlackTextViewController:
-    :git: https://github.com/rafaelks/SlackTextViewController.git
 
 CHECKOUT OPTIONS:
   MobilePlayer:
@@ -143,44 +156,44 @@ CHECKOUT OPTIONS:
   RCMarkdownParser:
     :commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
     :git: https://github.com/RocketChat/RCMarkdownParser.git
+  RocketChatViewController:
+    :commit: 918d9d91fb856b836795e673b112dc2624f2be06
+    :git: https://github.com/RocketChat/RocketChatViewController
   SimpleImageViewer:
     :commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
     :git: https://github.com/cardoso/SimpleImageViewer.git
-  SlackTextViewController:
-    :commit: 944b7cc4de734638cdefdecb9c7d7846fc3ab252
-    :git: https://github.com/rafaelks/SlackTextViewController.git
 
 SPEC CHECKSUMS:
   1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
-  Crashlytics: ccaac42660eb9351b9960c0d66106b0bcf99f4fa
-  DifferenceKit: 2037137305c55a39ff729baa72697efa30b1052d
-  Fabric: f233c9492b3bbc1f04e3882986740f7988a58edb
-  Firebase: 25812f43e7a53b11ae2f0a5f4c6d12faeb1f7cd7
-  FirebaseAnalytics: df15839e9c6ca6bd14d2e8ab6b0c672e6c49097e
-  FirebaseCore: 27bd80e5bfaaf9552a1f5cacb4c7e8bb925bab22
-  FirebaseInstanceID: ea5af6920d0a4a29b40459d055bebe4a6c1333c4
+  Crashlytics: ca7ab4bc304aa216bdc2e4c1a96389ee77252203
+  DifferenceKit: 5179eaf0e76a1b9fbaeb93f4c1a82510be63ca65
+  Fabric: d2b22f443ba195d8a7cc204da230977c72733b40
+  Firebase: 9190018e296139d938b99521cde0c15a6e8d2946
+  FirebaseAnalytics: 63202d2665de4e6adcbdce189135255d8b5962ba
+  FirebaseCore: 027d350adc039aa5483357c6f56556f117c5170e
+  FirebaseInstanceID: e2fa4cb35ef5558c200f7f0ad8a53e212215f93e
   FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
   FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
-  GoogleAppMeasurement: fc4a4c3fe0144db9313cbf443ffe62e6b1d6268c
-  GoogleUtilities: 6f681e27050c5e130325e89fa0316dfca826f954
+  GoogleAppMeasurement: 5029d78f2b438bd30ffb44e6c558b57c21622727
+  GoogleUtilities: abb092d2c12e817fa3e0e7b274987dd72fb86ec3
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   MobilePlayer: 069b13482499f14c25b6ce53f63a91e17975b073
-  nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
-  Nuke: a9a31bbd6c6723753ab024ef22057dcaaf046c1b
-  Nuke-FLAnimatedImage-Plugin: 6dfb9335ce298eaff9fdfed8d20d1bbfb2a6c326
+  nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48
+  Nuke: 3814db501e55f17951451839c726ffd91641e9a5
+  Nuke-FLAnimatedImage-Plugin: e4c39d13061a08ac0bdcb0cd7a23882f4a43f4a6
   OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
   RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
   ReachabilitySwift: 35720ffea59c1c76d15f885be77fd33e33985427
-  Realm: 3d36f208bf3aff8335dc3298742140182bde4edb
-  RealmSwift: aa4d11917bfcfaa3ed51f219102a487ecd895447
+  Realm: cdaef23c4ddb36ab1ddffed23f5a7f3332fc5585
+  RealmSwift: 5576324033f0aa5ef1e0a839a3da2281dff47a7f
+  RocketChatViewController: 00d436e393ac0bd0a62bc72d9a35a9043fc3f3a5
   semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
   SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
-  SlackTextViewController: b854e62c1c156336bc4fd409c6ca79b5773e8f9d
   Starscream: 142bd8ef24592d985daee9fa48c936070b85b15f
   SwiftLint: 3207c1faa2240bf8973b191820a116113cd11073
-  SwiftyJSON: c29297daf073d2aa016295d5809cdd68045c39b3
+  SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
   SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20
 
-PODFILE CHECKSUM: 6b8602cb3bfdb2d5969e91f6f161923d47884c5c
+PODFILE CHECKSUM: 5d62982fe6d8cd234f28edafc23b27595439d854
 
 COCOAPODS: 1.5.3