mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-29 07:42:40 +00:00
Merge branch 'ismail/5068_start_thread' into ismail/5117_thread_message_actions
This commit is contained in:
ismailgulek
commit
5238165e63
5 changed files with 43 additions and 99 deletions
|
|
@ -87,23 +87,6 @@ final class RoomCoordinatorBridgePresenter: NSObject {
|
|||
// MARK: - Public
|
||||
|
||||
func present(from viewController: UIViewController, animated: Bool) {
|
||||
|
||||
if bridgeParameters.threadId != nil {
|
||||
let coordinator = self.createRoomCoordinator()
|
||||
coordinator.delegate = self
|
||||
coordinator.start()
|
||||
let presentable = coordinator.toPresentable()
|
||||
|
||||
let presentationController = CustomSizedPresentationController(presentedViewController: presentable,
|
||||
presenting: viewController)
|
||||
presentationController.dismissOnBackgroundTap = false
|
||||
presentationController.cornerRadius = 12
|
||||
presentable.transitioningDelegate = presentationController
|
||||
viewController.present(presentable, animated: animated, completion: nil)
|
||||
|
||||
self.coordinator = coordinator
|
||||
return
|
||||
}
|
||||
let coordinator = self.createRoomCoordinator()
|
||||
coordinator.delegate = self
|
||||
let presentable = coordinator.toPresentable()
|
||||
|
|
|
|||
|
|
@ -4636,15 +4636,6 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
|||
{
|
||||
[self declineRoomInvitation];
|
||||
}
|
||||
else if ([titleView isKindOfClass:ThreadRoomTitleView.class])
|
||||
{
|
||||
ThreadRoomTitleView *threadTitleView = (ThreadRoomTitleView *)titleView;
|
||||
if (tappedView == threadTitleView.closeButton)
|
||||
{
|
||||
// dismiss self
|
||||
[self dismissViewControllerAnimated:YES completion:nil];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- (void)declineRoomInvitation
|
||||
|
|
@ -6338,7 +6329,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
|
|||
previewData:nil];
|
||||
self.threadBridgePresenter = [[RoomCoordinatorBridgePresenter alloc] initWithParameters:parameters];
|
||||
self.threadBridgePresenter.delegate = self;
|
||||
[self.threadBridgePresenter presentFrom:self animated:YES];
|
||||
[self.threadBridgePresenter pushFrom:self.navigationController animated:YES];
|
||||
}
|
||||
|
||||
#pragma mark - RoomContextualMenuViewControllerDelegate
|
||||
|
|
|
|||
|
|
@ -43,16 +43,12 @@ class ThreadRoomTitleView: RoomTitleView {
|
|||
|
||||
// Individual views
|
||||
@IBOutlet private weak var partialTitleLabel: UILabel!
|
||||
@IBOutlet private weak var fullCloseButton: UIButton!
|
||||
@IBOutlet private weak var fullTitleLabel: UILabel!
|
||||
@IBOutlet private weak var fullRoomAvatarView: RoomAvatarView!
|
||||
@IBOutlet private weak var fullRoomEncryptionBadgeView: UIImageView!
|
||||
@IBOutlet private weak var fullRoomNameLabel: UILabel!
|
||||
@IBOutlet private weak var fullOptionsButton: UIButton!
|
||||
|
||||
var closeButton: UIButton {
|
||||
return fullCloseButton
|
||||
}
|
||||
|
||||
override var mxRoom: MXRoom! {
|
||||
didSet {
|
||||
updateMode()
|
||||
|
|
@ -81,12 +77,24 @@ class ThreadRoomTitleView: RoomTitleView {
|
|||
fallbackImage: AvatarFallbackImage.matrixItem(room.matrixItemId,
|
||||
room.displayName))
|
||||
fullRoomAvatarView.fill(with: avatarViewData)
|
||||
|
||||
guard let summary = room.summary else {
|
||||
fullRoomEncryptionBadgeView.isHidden = true
|
||||
return
|
||||
}
|
||||
if summary.isEncrypted && room.mxSession.crypto != nil {
|
||||
fullRoomEncryptionBadgeView.image = EncryptionTrustLevelBadgeImageHelper.roomBadgeImage(for: summary.roomEncryptionTrustLevel())
|
||||
fullRoomEncryptionBadgeView.isHidden = false
|
||||
} else {
|
||||
fullRoomEncryptionBadgeView.isHidden = true
|
||||
}
|
||||
}
|
||||
|
||||
override func awakeFromNib() {
|
||||
super.awakeFromNib()
|
||||
|
||||
update(theme: ThemeService.shared().theme)
|
||||
registerThemeServiceDidChangeThemeNotification()
|
||||
}
|
||||
|
||||
override func didMoveToSuperview() {
|
||||
|
|
@ -101,6 +109,13 @@ class ThreadRoomTitleView: RoomTitleView {
|
|||
}
|
||||
}
|
||||
|
||||
private func registerThemeServiceDidChangeThemeNotification() {
|
||||
NotificationCenter.default.addObserver(self,
|
||||
selector: #selector(themeDidChange),
|
||||
name: .themeServiceDidChangeTheme,
|
||||
object: nil)
|
||||
}
|
||||
|
||||
private func updateMode() {
|
||||
// ensure both mxRoom and threadId are set
|
||||
guard let room = mxRoom,
|
||||
|
|
@ -133,11 +148,8 @@ class ThreadRoomTitleView: RoomTitleView {
|
|||
|
||||
// MARK: - Actions
|
||||
|
||||
@IBAction private func closeButtonTapped(_ sender: UIButton) {
|
||||
let gesture = UITapGestureRecognizer(target: nil, action: nil)
|
||||
closeButton.addGestureRecognizer(gesture)
|
||||
tapGestureDelegate.roomTitleView(self, recognizeTapGesture: gesture)
|
||||
closeButton.removeGestureRecognizer(gesture)
|
||||
@objc private func themeDidChange() {
|
||||
self.update(theme: ThemeService.shared().theme)
|
||||
}
|
||||
|
||||
@IBAction private func optionsButtonTapped(_ sender: UIButton) {
|
||||
|
|
@ -150,10 +162,10 @@ extension ThreadRoomTitleView: Themable {
|
|||
|
||||
func update(theme: Theme) {
|
||||
partialTitleLabel.textColor = theme.colors.primaryContent
|
||||
fullCloseButton.tintColor = theme.colors.secondaryContent
|
||||
fullRoomAvatarView.backgroundColor = .clear
|
||||
fullTitleLabel.textColor = theme.colors.primaryContent
|
||||
fullRoomNameLabel.textColor = theme.colors.secondaryContent
|
||||
fullOptionsButton.tintColor = theme.colors.secondaryContent
|
||||
fullOptionsButton.tintColor = theme.colors.accent
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,33 +34,30 @@
|
|||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ami-Cg-fcA">
|
||||
<rect key="frame" x="0.0" y="0.0" width="243" height="64"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PDP-Yq-nqL">
|
||||
<rect key="frame" x="8" y="15" width="34" height="34"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="PDP-Yq-nqL" secondAttribute="height" multiplier="1:1" id="WBg-V1-Oj9"/>
|
||||
</constraints>
|
||||
<inset key="contentEdgeInsets" minX="6" minY="6" maxX="6" maxY="6"/>
|
||||
<state key="normal" image="new_close"/>
|
||||
<connections>
|
||||
<action selector="closeButtonTapped:" destination="iN0-l3-epB" eventType="touchUpInside" id="8xF-EL-rHZ"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Thread" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BnG-NU-7Mg">
|
||||
<rect key="frame" x="50" y="22.5" width="51.5" height="19.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<rect key="frame" x="48" y="22" width="56.5" height="20.5"/>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FJB-2F-rrQ" customClass="RoomAvatarView" customModule="Riot" customModuleProvider="target">
|
||||
<rect key="frame" x="109.5" y="24" width="16" height="16"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
<rect key="frame" x="112.5" y="24" width="16" height="16"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="16" id="Fg7-y5-fEC"/>
|
||||
<constraint firstAttribute="height" constant="16" id="Qxm-RC-uC5"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Mli-PC-WUh">
|
||||
<rect key="frame" x="122.5" y="28" width="12" height="12"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="Mli-PC-WUh" secondAttribute="height" multiplier="1:1" id="Ohw-dy-qg0"/>
|
||||
<constraint firstAttribute="width" constant="12" id="nKB-SN-cO0"/>
|
||||
</constraints>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Room name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8lk-sN-3IP">
|
||||
<rect key="frame" x="129.5" y="24.5" width="67" height="15"/>
|
||||
<rect key="frame" x="139.5" y="24.5" width="67" height="15"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="12"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -77,15 +74,15 @@
|
|||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstItem="Unx-UY-EgO" firstAttribute="centerY" secondItem="Ami-Cg-fcA" secondAttribute="centerY" id="30B-oO-Ka5"/>
|
||||
<constraint firstItem="PDP-Yq-nqL" firstAttribute="leading" secondItem="Ami-Cg-fcA" secondAttribute="leading" constant="8" id="L6L-SK-wtZ"/>
|
||||
<constraint firstItem="Mli-PC-WUh" firstAttribute="centerX" secondItem="FJB-2F-rrQ" secondAttribute="trailing" id="BU4-yl-DrP"/>
|
||||
<constraint firstItem="BnG-NU-7Mg" firstAttribute="leading" secondItem="Ami-Cg-fcA" secondAttribute="leading" constant="48" id="ES6-mL-Y9F"/>
|
||||
<constraint firstItem="8lk-sN-3IP" firstAttribute="centerY" secondItem="Ami-Cg-fcA" secondAttribute="centerY" id="S0S-6y-Vkn"/>
|
||||
<constraint firstItem="FJB-2F-rrQ" firstAttribute="leading" secondItem="BnG-NU-7Mg" secondAttribute="trailing" constant="8" id="SQk-zN-CO6"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Unx-UY-EgO" secondAttribute="trailing" constant="16" id="dpB-Nz-PQ9"/>
|
||||
<constraint firstItem="PDP-Yq-nqL" firstAttribute="centerY" secondItem="Ami-Cg-fcA" secondAttribute="centerY" id="gjN-k4-wFE"/>
|
||||
<constraint firstItem="FJB-2F-rrQ" firstAttribute="centerY" secondItem="Ami-Cg-fcA" secondAttribute="centerY" id="nY0-2s-Wgo"/>
|
||||
<constraint firstItem="8lk-sN-3IP" firstAttribute="leading" secondItem="FJB-2F-rrQ" secondAttribute="trailing" constant="4" id="ql2-B3-82Y"/>
|
||||
<constraint firstItem="8lk-sN-3IP" firstAttribute="leading" secondItem="FJB-2F-rrQ" secondAttribute="trailing" constant="11" id="ql2-B3-82Y"/>
|
||||
<constraint firstItem="BnG-NU-7Mg" firstAttribute="centerY" secondItem="Ami-Cg-fcA" secondAttribute="centerY" id="rwC-ak-Ydb"/>
|
||||
<constraint firstItem="BnG-NU-7Mg" firstAttribute="leading" secondItem="PDP-Yq-nqL" secondAttribute="trailing" constant="8" id="tV2-03-0Ss"/>
|
||||
<constraint firstItem="Mli-PC-WUh" firstAttribute="bottom" secondItem="FJB-2F-rrQ" secondAttribute="bottom" id="ulL-Xh-oCC"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
|
|
@ -103,10 +100,10 @@
|
|||
</constraints>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="fullCloseButton" destination="PDP-Yq-nqL" id="rQx-N0-cbS"/>
|
||||
<outlet property="fullContainerView" destination="Ami-Cg-fcA" id="Fo9-bp-DMP"/>
|
||||
<outlet property="fullOptionsButton" destination="Unx-UY-EgO" id="657-Eq-QhA"/>
|
||||
<outlet property="fullRoomAvatarView" destination="FJB-2F-rrQ" id="iok-M1-un0"/>
|
||||
<outlet property="fullRoomEncryptionBadgeView" destination="Mli-PC-WUh" id="Ipu-zu-qBB"/>
|
||||
<outlet property="fullRoomNameLabel" destination="8lk-sN-3IP" id="bDF-fD-KmE"/>
|
||||
<outlet property="fullTitleLabel" destination="BnG-NU-7Mg" id="zhJ-om-6HM"/>
|
||||
<outlet property="partialContainerView" destination="p54-De-nkd" id="huG-Db-CIU"/>
|
||||
|
|
@ -116,7 +113,6 @@
|
|||
</view>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="new_close" width="16" height="16"/>
|
||||
<image name="spaces_more" width="24" height="24"/>
|
||||
<systemColor name="systemBackgroundColor">
|
||||
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
|
|
|
|||
|
|
@ -20,11 +20,6 @@ class ThreadViewController: RoomViewController {
|
|||
|
||||
// MARK: Private
|
||||
|
||||
private enum Constants {
|
||||
static let sizeOniPad: CGSize = CGSize(width: 375, height: 667)
|
||||
static let additionalTopInset: CGFloat = 20
|
||||
}
|
||||
|
||||
private(set) var threadId: String!
|
||||
|
||||
class func instantiate(withThreadId threadId: String,
|
||||
|
|
@ -49,37 +44,4 @@ class ThreadViewController: RoomViewController {
|
|||
threadTitleView.threadId = threadId
|
||||
}
|
||||
|
||||
private func topSafeAreaInset() -> CGFloat {
|
||||
guard let window = UIApplication.shared.keyWindow else {
|
||||
return Constants.additionalTopInset
|
||||
}
|
||||
|
||||
return window.safeAreaInsets.top + Constants.additionalTopInset
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// MARK: - CustomSizedPresentable
|
||||
|
||||
extension ThreadViewController: CustomSizedPresentable {
|
||||
|
||||
func customSize(withParentContainerSize containerSize: CGSize) -> CGSize {
|
||||
if UIDevice.current.isPhone {
|
||||
return CGSize(width: containerSize.width,
|
||||
height: containerSize.height - topSafeAreaInset())
|
||||
}
|
||||
return Constants.sizeOniPad
|
||||
}
|
||||
|
||||
func position(withParentContainerSize containerSize: CGSize) -> CGPoint {
|
||||
let mySize = customSize(withParentContainerSize: containerSize)
|
||||
|
||||
if UIDevice.current.isPhone {
|
||||
return CGPoint(x: 0, y: topSafeAreaInset())
|
||||
}
|
||||
|
||||
return CGPoint(x: (containerSize.width - mySize.width)/2,
|
||||
y: (containerSize.height - mySize.height)/2)
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue