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

Commit

Permalink
Merge pull request #2652 from RocketChat/beta
Browse files Browse the repository at this point in the history 
[RELEASE] Merge BETA into MASTER
  • Loading branch information
@rafaelks
rafaelks authored Apr 8, 2019
2 parents 201fe64 + ac55c74 commit df0e867
Show file tree
Hide file tree
Showing 54 changed files with 2,101 additions and 1,618 deletions.
4 changes: 0 additions & 4 deletions Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,6 @@ def shared_pods
pod 'OAuthSwift'
pod '1PasswordExtension'

# DiffKit
diff_pods

# Debugging
pod 'SwiftLint', :configurations => ['Debug']
pod 'FLEX', '~> 2.0', :configurations => ['Debug', 'Beta']
Expand Down Expand Up @@ -82,7 +79,6 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.1'
config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['ARCHS'] = 'arm64'

if config.name == 'Debug'
config.build_settings['SWIFT_OPTIMIZATION_LEVEL'] = '-Onone'
Expand Down
2 changes: 1 addition & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,6 @@ SPEC CHECKSUMS:
SwiftyJSON: c4bcba26dd9ec7a027fc8eade48e2c911f229e96
SwipeCellKit: d8f2617538ce3021cb0a11d1b93856a06a2f2e20

PODFILE CHECKSUM: cbbebee0941a6f5f7f64b4a05944c537b22215a4
PODFILE CHECKSUM: c5c2f2dc03abb29b2bd3f58d81e244a50136c6d3

COCOAPODS: 1.5.3
2 changes: 1 addition & 1 deletion Pods/Manifest.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2,752 changes: 1,320 additions & 1,432 deletions Pods/Pods.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

21 changes: 13 additions & 8 deletions Rocket.Chat.ShareExtension/Compose/SEComposeHeaderViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ extension SEComposeHeaderViewModel {
doneButtonState = showsActivityIndicator ? .cancel : .send
backButtonEnabled = !showsActivityIndicator

let symbol: String
switch state.currentRoom.type {
case .channel, .group:
symbol = "#"
case .directMessage:
symbol = "@"
}
if state.currentRoom.isDiscussion {
destinationText = state.currentRoom.fname
} else {
let symbol: String
switch state.currentRoom.type {
case .channel, .group:
symbol = "#"
case .directMessage:
symbol = "@"
}

destinationText = "\(symbol)\(state.currentRoom.name)"
destinationText = "\(symbol)\(state.currentRoom.name)"
}
}

}
4 changes: 2 additions & 2 deletions Rocket.Chat.ShareExtension/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>XPC!</string>
<key>CFBundleShortVersionString</key>
<string>3.4.0</string>
<string>3.4.1</string>
<key>CFBundleVersion</key>
<string>247</string>
<string>250</string>
<key>ITSEncryptionExportComplianceCode</key>
<string></string>
<key>NSExtension</key>
Expand Down
4 changes: 4 additions & 0 deletions Rocket.Chat.ShareExtension/Rooms/SERoomCellModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ struct SERoomCellModel: SECellModel {
let avatarBaseUrl: String

var name: String {
if room.isDiscussion {
return room.fname
}

return room.name
}

Expand Down
12 changes: 12 additions & 0 deletions Rocket.Chat.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@
41C955FC20A3937A00FC8314 /* ChatMessageActionButtonsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41C955FB20A3937A00FC8314 /* ChatMessageActionButtonsView.swift */; };
41CD52D520BEFA3B00336892 /* New Room.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 41CD52D420BEFA3B00336892 /* New Room.storyboard */; };
41D0DA5820991BAE008649E7 /* UploadMessageRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80054CF61FD9AA1B00F5ECF9 /* UploadMessageRequest.swift */; };
41D1610B2254E0B300B42274 /* MessageDiscussionChatItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41D1610A2254E0B300B42274 /* MessageDiscussionChatItem.swift */; };
41D1610E2254E1D300B42274 /* MessageDiscussionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41D1610C2254E1D300B42274 /* MessageDiscussionCell.xib */; };
41D1610F2254E1D300B42274 /* MessageDiscussionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41D1610D2254E1D300B42274 /* MessageDiscussionCell.swift */; };
41D3668620C0323100970B99 /* SubscriptionsSortingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41D3668320C0323000970B99 /* SubscriptionsSortingView.xib */; };
41D3668720C0323100970B99 /* SubscriptionsSortingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41D3668420C0323100970B99 /* SubscriptionsSortingView.swift */; };
41D3668820C0323100970B99 /* SubscriptionsSortingViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41D3668520C0323100970B99 /* SubscriptionsSortingViewModel.swift */; };
Expand Down Expand Up @@ -1342,6 +1345,9 @@
41CABFF71F5047D600E0B289 /* ChatLoaderCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChatLoaderCell.xib; sourceTree = "<group>"; };
41CABFF91F5047E200E0B289 /* ChatLoaderCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChatLoaderCell.swift; sourceTree = "<group>"; };
41CD52D420BEFA3B00336892 /* New Room.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "New Room.storyboard"; sourceTree = "<group>"; };
41D1610A2254E0B300B42274 /* MessageDiscussionChatItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageDiscussionChatItem.swift; sourceTree = "<group>"; };
41D1610C2254E1D300B42274 /* MessageDiscussionCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MessageDiscussionCell.xib; sourceTree = "<group>"; };
41D1610D2254E1D300B42274 /* MessageDiscussionCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MessageDiscussionCell.swift; sourceTree = "<group>"; };
41D3668320C0323000970B99 /* SubscriptionsSortingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SubscriptionsSortingView.xib; sourceTree = "<group>"; };
41D3668420C0323100970B99 /* SubscriptionsSortingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionsSortingView.swift; sourceTree = "<group>"; };
41D3668520C0323100970B99 /* SubscriptionsSortingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SubscriptionsSortingViewModel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -4001,6 +4007,8 @@
9977D858217E94C400FE5EC6 /* MessageActionsCell.swift */,
4190694021D0E82E00FE2573 /* MessageVideoCallCell.xib */,
4190694121D0E82E00FE2573 /* MessageVideoCallCell.swift */,
41D1610C2254E1D300B42274 /* MessageDiscussionCell.xib */,
41D1610D2254E1D300B42274 /* MessageDiscussionCell.swift */,
4101B02A21A2EF8C00772F7C /* HeaderCell.xib */,
4101B02C21A2EF9300772F7C /* HeaderCell.swift */,
);
Expand All @@ -4027,6 +4035,7 @@
9914183E2166CFA4007D2AA2 /* MessageURLChatItem.swift */,
9977D85A217E999800FE5EC6 /* MessageActionsChatItem.swift */,
4190693E21D0E7F600FE2573 /* MessageVideoCallChatItem.swift */,
41D1610A2254E0B300B42274 /* MessageDiscussionChatItem.swift */,
4101B02821A2EF6B00772F7C /* HeaderChatItem.swift */,
);
path = ChatItems;
Expand Down Expand Up @@ -4467,6 +4476,7 @@
99363FCA20C8657400AA68C0 /* ShowMoreSeparatorTableViewCell.xib in Resources */,
14F8A242202E5D0600175FDC /* [email protected] in Resources */,
806465EC1FED19B9001F27DB /* EmojiView.xib in Resources */,
41D1610E2254E1D300B42274 /* MessageDiscussionCell.xib in Resources */,
41833F4E1DEF16B600E54655 /* Keys.plist in Resources */,
4124FCC91F7A6BF9008ED4C3 /* ChannelInfoActionCell.xib in Resources */,
991AB00A217458790097AE4C /* AudioMessageCell.xib in Resources */,
Expand Down Expand Up @@ -5206,6 +5216,7 @@
80D41DFD2092378400034D1F /* StarMessageRequest.swift in Sources */,
33D08E2A20BD5F24008D03EF /* TopTransparentViewController.swift in Sources */,
991AB00C217459690097AE4C /* AudioMessageCell.swift in Sources */,
41D1610F2254E1D300B42274 /* MessageDiscussionCell.swift in Sources */,
993B7B40215F0B730067B962 /* FileMessageChatItem.swift in Sources */,
801DF8151FD7172500302CC8 /* SubscriptionUserView.swift in Sources */,
4112DC591FFFB9B2005995E1 /* ModelHandler.swift in Sources */,
Expand Down Expand Up @@ -5305,6 +5316,7 @@
8073719A1F94E83600D53ADF /* SocketError.swift in Sources */,
413FB6C11FE17D7D00F010AA /* UIViewExtentions.swift in Sources */,
1496A86D20FA4644005C2E14 /* NotificationsChooseCell.swift in Sources */,
41D1610B2254E0B300B42274 /* MessageDiscussionChatItem.swift in Sources */,
8076FDB0204856AF00114F28 /* AuthCanBlockMessage.swift in Sources */,
8076FDA9204853DE00114F28 /* RealmExecute.swift in Sources */,
80461ACD2191D0D1003F1F32 /* TextHintEmojiViewCell.swift in Sources */,
Expand Down
6 changes: 5 additions & 1 deletion Rocket.Chat/Controllers/Chat/ChannelActionsViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ class ChannelActionsViewController: BaseViewController {
let hasAnnouncement = !(subscription.roomAnnouncement?.isEmpty ?? true)
let hasTopic = !(subscription.roomTopic?.isEmpty ?? true)

header = [ChannelInfoBasicCellData(title: "#\(subscription.name)")]
if subscription.isDiscussion {
header = [ChannelInfoBasicCellData(title: subscription.fname)]
} else {
header = [ChannelInfoBasicCellData(title: "#\(subscription.name)")]
}

if hasDescription {
header?.append(ChannelInfoDescriptionCellData(
Expand Down
Loading

0 comments on commit df0e867

Please sign in to comment.