Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 92afb0e

Browse files
authored
Merge branch 'develop' into master
2 parents 962b677 + cada780 commit 92afb0e

56 files changed

Lines changed: 2447 additions & 120 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Podfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ PODS:
33
- Crashlytics (3.10.5):
44
- Fabric (~> 1.7.9)
55
- Fabric (1.7.9)
6-
- Firebase/Core (5.4.0):
6+
- Firebase/Core (5.4.1):
77
- Firebase/CoreOnly
88
- FirebaseAnalytics (= 5.0.1)
9-
- Firebase/CoreOnly (5.4.0):
10-
- FirebaseCore (= 5.0.5)
9+
- Firebase/CoreOnly (5.4.1):
10+
- FirebaseCore (= 5.0.6)
1111
- FirebaseAnalytics (5.0.1):
1212
- FirebaseCore (~> 5.0)
1313
- FirebaseInstanceID (~> 3.0)
1414
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
1515
- nanopb (~> 0.3)
16-
- FirebaseCore (5.0.5):
16+
- FirebaseCore (5.0.6):
1717
- "GoogleToolboxForMac/NSData+zlib (~> 2.1)"
1818
- FirebaseInstanceID (3.1.1):
1919
- FirebaseCore (~> 5.0)
@@ -29,18 +29,18 @@ PODS:
2929
- nanopb/encode (= 0.3.8)
3030
- nanopb/decode (0.3.8)
3131
- nanopb/encode (0.3.8)
32-
- Nuke (7.3)
32+
- Nuke (7.3.2)
3333
- Nuke-FLAnimatedImage-Plugin (5.0):
3434
- FLAnimatedImage (~> 1.0)
3535
- Nuke (~> 7.0)
3636
- OAuthSwift (1.2.2)
3737
- RCMarkdownParser (3.0.6)
3838
- ReachabilitySwift (4.1.0)
39-
- Realm (3.7.4):
40-
- Realm/Headers (= 3.7.4)
41-
- Realm/Headers (3.7.4)
42-
- RealmSwift (3.7.4):
43-
- Realm (= 3.7.4)
39+
- Realm (3.7.5):
40+
- Realm/Headers (= 3.7.5)
41+
- Realm/Headers (3.7.5)
42+
- RealmSwift (3.7.5):
43+
- Realm (= 3.7.5)
4444
- semver (1.1.0)
4545
- SimpleImageViewer (1.2.0):
4646
- FLAnimatedImage
@@ -110,7 +110,7 @@ CHECKOUT OPTIONS:
110110
:commit: c7160990d7b50d34a45514df4535011e64541340
111111
:git: https://github.com/RocketChat/RCiOSMobilePlayer
112112
RCMarkdownParser:
113-
:commit: 43d99beabd1c39f8988d2e6631a46623b0116906
113+
:commit: c34d9ccef689c55b9eae69f3c65283da8d8b0c6c
114114
:git: https://github.com/RocketChat/RCMarkdownParser.git
115115
SimpleImageViewer:
116116
:commit: 8222c338de0f285ca0c2d556c5d8dedd4a365b52
@@ -123,23 +123,23 @@ SPEC CHECKSUMS:
123123
1PasswordExtension: 0e95bdea64ec8ff2f4f693be5467a09fac42a83d
124124
Crashlytics: 7f2e38d302d9da96475b3d64d86fb29e31a542b7
125125
Fabric: a2917d3895e4c1569b9c3170de7320ea1b1e6661
126-
Firebase: d66f4f29c23f22d96808d9abc174d81d8eee968f
126+
Firebase: 355bd535bfdacaa82a7fe8d9784115edefd6fc03
127127
FirebaseAnalytics: b3628aea54c50464c32c393fb2ea032566e7ecc2
128-
FirebaseCore: 42b3267233bd21a5abd54117ccc38ca3dd0f8e83
128+
FirebaseCore: 4c28e3b9708ba48a765e76515f913a71596eb5dd
129129
FirebaseInstanceID: f3f0657372592ecdfdfe2cac604a5a75758376a6
130130
FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31
131131
FLEX: bd1a39e55b56bb413b6f1b34b3c10a0dc44ef079
132132
GoogleToolboxForMac: 91c824d21e85b31c2aae9bb011c5027c9b4e738f
133133
MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
134134
MobilePlayer: 069b13482499f14c25b6ce53f63a91e17975b073
135135
nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
136-
Nuke: 3680b7186b18f84a5e9e283bfce4357bfd70fdf9
136+
Nuke: a9a31bbd6c6723753ab024ef22057dcaaf046c1b
137137
Nuke-FLAnimatedImage-Plugin: 6dfb9335ce298eaff9fdfed8d20d1bbfb2a6c326
138138
OAuthSwift: 27b34fe80b76b67cd8f45571e0be2432bc9f6de1
139139
RCMarkdownParser: 518b616a4f48bb02247243544d4fd55c048288a4
140140
ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
141-
Realm: a469bb59e33f9926102ccaea4349822c53b9117e
142-
RealmSwift: a45861b21c180f5cf0f122144b9759fa8dde3e9e
141+
Realm: c286caf4dbf346ce24aad49ca76c7ce622d4a082
142+
RealmSwift: 2a9281e37d6de55f66f76254d49d28aeb1b729e4
143143
semver: 11ae3bc4a6036efbc86b5863ef5fa32c065c8bbd
144144
SimpleImageViewer: 6ed0d2acf7c166a5b4e795bccc7b9ea1b225ff9b
145145
SlackTextViewController: b854e62c1c156336bc4fd409c6ca79b5773e8f9d

README.md

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
![Rocket.Chat logo](https://raw.githubusercontent.com/RocketChat/Rocket.Chat.Artwork/master/Logos/logo-dark.svg?sanitize=true)
1+
![](https://user-images.githubusercontent.com/551004/43643393-884b00a4-9701-11e8-94d8-14c46d1f3660.png)
22

3+
<p align="center" style="color: gray;">
4+
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
5+
</p>
36

4-
![Screenshot](https://user-images.githubusercontent.com/7317008/43209700-eb3ded88-904a-11e8-8ec4-9ac10a39f344.png)
7+
<br />
58

6-
<p align="center">
9+
![Screenshot](https://user-images.githubusercontent.com/551004/43643732-af17fab0-9702-11e8-819f-405afa7c6b64.png)
10+
11+
<p align="center">
712
<a href=https://geo.itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8>
813
<img alt="Download on the app store" src="https://user-images.githubusercontent.com/7317008/43209852-4ca39622-904b-11e8-8ce1-cdc3aee76ae9.png" width=160>
914
</a>
10-
</p>
15+
</p>
1116

1217
# Rocket.Chat iOS native application
1318

@@ -40,6 +45,18 @@ Make sure your server supports WebSocket as well as SSL. Apache supports WebSock
4045

4146
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.
4247

48+
# Themes ☀️🌙
49+
50+
Choose from 3 new themes to take you from day to night.
51+
52+
![Themes](https://user-images.githubusercontent.com/551004/43647513-35fea6d6-970e-11e8-9712-56e4b24e7a1b.png)
53+
54+
# iPad
55+
56+
We have developed an exclusive experience for iPad users: you can now multitask by using Rocket.Chat at the same time as other apps.
57+
58+
![iPad](https://user-images.githubusercontent.com/551004/43647100-043903d6-970d-11e8-89c5-d7d677e26278.png)
59+
4360
# Donate
4461

4562
[![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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>XPC!</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>3.0.4</string>
20+
<string>3.1.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>206</string>
22+
<string>207</string>
2323
<key>ITSEncryptionExportComplianceCode</key>
2424
<string></string>
2525
<key>NSExtension</key>

Rocket.Chat.ShareExtension/State/SEState.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@ struct SEState {
4242
let displayedRooms: [Subscription]
4343
switch searchRooms {
4444
case .none:
45-
displayedRooms = rooms
45+
displayedRooms = rooms.filter { $0.open }
4646
case .searching(let search):
4747
let search = search.lowercased()
4848
displayedRooms = rooms.filter {
4949
$0.fname.lowercased().contains(search) || $0.name.lowercased().contains(search)
5050
}
5151
case .started:
52-
displayedRooms = rooms
52+
displayedRooms = rooms.filter { $0.open }
5353
}
5454
return displayedRooms.sorted(by: { $0.name < $1.name })
5555
}

0 commit comments

Comments
 (0)