App Layout: added space invites in space bottom sheet

- UI tweaks
This commit is contained in:
Gil Eluard
2022-08-22 13:42:37 +02:00
parent cc2d9ef927
commit 2271cc452f
4 changed files with 64 additions and 81 deletions
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,14 +12,34 @@
<!--Space Detail View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController extendedLayoutIncludesOpaqueBars="YES" id="Y6W-OH-hqX" customClass="SpaceDetailViewController" customModule="Element" customModuleProvider="target" sceneMemberID="viewController">
<viewController extendedLayoutIncludesOpaqueBars="YES" id="Y6W-OH-hqX" customClass="SpaceDetailViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="842"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="22X-aK-4D2">
<rect key="frame" x="16" y="60" width="382" height="76"/>
<rect key="frame" x="16" y="16" width="382" height="76"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yVi-9K-5iE" customClass="RoomAvatarView" customModule="Riot" customModuleProvider="target">
<rect key="frame" x="0.0" y="4" width="32" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="OZZ-dW-Uuc"/>
<constraint firstAttribute="width" constant="32" id="qAF-jw-btk"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="display name invited you" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oZk-F6-3nn">
<rect key="frame" x="44" y="0.0" width="306" height="17"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="@userid:matrix.org" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vw0-9q-U23">
<rect key="frame" x="44" y="19" width="306" height="17"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GbA-LS-7G8">
<rect key="frame" x="0.0" y="50" width="382" height="1"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
@@ -30,14 +50,22 @@
</subviews>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="bottom" secondItem="GbA-LS-7G8" secondAttribute="bottom" constant="25" id="Bb9-cK-W7m"/>
<constraint firstAttribute="trailing" secondItem="Vw0-9q-U23" secondAttribute="trailing" constant="32" id="35Q-0D-eaP"/>
<constraint firstItem="Vw0-9q-U23" firstAttribute="leading" secondItem="yVi-9K-5iE" secondAttribute="trailing" constant="12" id="5jU-Wj-fli"/>
<constraint firstAttribute="height" constant="76" id="GXB-6p-EIC"/>
<constraint firstAttribute="trailing" secondItem="GbA-LS-7G8" secondAttribute="trailing" id="HI3-0y-tyY"/>
<constraint firstItem="Vw0-9q-U23" firstAttribute="bottom" secondItem="yVi-9K-5iE" secondAttribute="bottom" id="IxE-pA-5bx"/>
<constraint firstItem="oZk-F6-3nn" firstAttribute="leading" secondItem="yVi-9K-5iE" secondAttribute="trailing" constant="12" id="UAC-PF-u3I"/>
<constraint firstItem="yVi-9K-5iE" firstAttribute="leading" secondItem="22X-aK-4D2" secondAttribute="leading" id="VDT-b0-SqV"/>
<constraint firstItem="oZk-F6-3nn" firstAttribute="top" secondItem="22X-aK-4D2" secondAttribute="top" id="Xkw-oz-SUD"/>
<constraint firstItem="GbA-LS-7G8" firstAttribute="top" secondItem="yVi-9K-5iE" secondAttribute="bottom" constant="14" id="eWu-Q8-50q"/>
<constraint firstAttribute="trailing" secondItem="oZk-F6-3nn" secondAttribute="trailing" constant="32" id="hSf-zB-m6e"/>
<constraint firstItem="GbA-LS-7G8" firstAttribute="leading" secondItem="22X-aK-4D2" secondAttribute="leading" id="o4Q-41-AfC"/>
<constraint firstItem="yVi-9K-5iE" firstAttribute="top" secondItem="22X-aK-4D2" secondAttribute="top" constant="4" id="x9I-eQ-C0t"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dxd-y5-bn4">
<rect key="frame" x="374" y="60" width="24" height="24"/>
<rect key="frame" x="374" y="16" width="24" height="24"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="24" id="TTq-xS-O71"/>
@@ -53,8 +81,8 @@
<action selector="closeActionWithSender:" destination="Y6W-OH-hqX" eventType="touchUpInside" id="TIh-gS-svg"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aSn-OV-epF" customClass="SpaceAvatarView" customModule="Element" customModuleProvider="target">
<rect key="frame" x="16" y="136" width="66" height="66"/>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aSn-OV-epF" customClass="SpaceAvatarView" customModule="Riot" customModuleProvider="target">
<rect key="frame" x="16" y="92" width="66" height="66"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="66" id="N0q-nk-kG6"/>
@@ -62,29 +90,29 @@
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Mp-yr-jUa">
<rect key="frame" x="16" y="226" width="382" height="17"/>
<rect key="frame" x="16" y="182" width="382" height="17"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="space_type_icon" translatesAutoresizingMaskIntoConstraints="NO" id="5eT-si-nJh">
<rect key="frame" x="16" y="256" width="16" height="16"/>
<rect key="frame" x="16" y="212" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="Hmz-Ud-9NT"/>
<constraint firstAttribute="height" constant="16" id="sak-fG-0Id"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="44" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ko6-Oy-KB4">
<rect key="frame" x="37" y="256" width="17" height="16"/>
<rect key="frame" x="37" y="212" width="17" height="16"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCallout"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VRt-iQ-AXx">
<rect key="frame" x="16" y="288" width="382" height="478"/>
<rect key="frame" x="16" y="244" width="382" height="488"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rg1-rU-wKD">
<rect key="frame" x="0.0" y="0.0" width="382" height="478"/>
<rect key="frame" x="0.0" y="0.0" width="382" height="488"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
@@ -102,7 +130,7 @@
<viewLayoutGuide key="frameLayoutGuide" id="REH-HY-tM4"/>
</scrollView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xQH-D8-TVA">
<rect key="frame" x="16" y="782" width="382" height="44"/>
<rect key="frame" x="16" y="748" width="382" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="UHd-DI-8BX"/>
</constraints>
@@ -112,7 +140,7 @@
</connections>
</button>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N1F-Ko-xvc">
<rect key="frame" x="16" y="782" width="382" height="44"/>
<rect key="frame" x="16" y="748" width="382" height="44"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="utA-Mz-rmH">
<rect key="frame" x="0.0" y="0.0" width="189" height="44"/>
@@ -180,13 +208,11 @@
<outlet property="closeButton" destination="dxd-y5-bn4" id="T5W-Ah-JMq"/>
<outlet property="declineButton" destination="utA-Mz-rmH" id="UwR-LU-rv5"/>
<outlet property="inviteActionPanel" destination="N1F-Ko-xvc" id="yjc-4a-nkf"/>
<outlet property="inviterAvatarView" destination="Fgg-tT-2Aj" id="tMD-aF-cSe"/>
<outlet property="inviterContentView" destination="22X-aK-4D2" id="uGu-XU-bu6"/>
<outlet property="inviterContentViewHeight" destination="GXB-6p-EIC" id="VCL-wF-kiK"/>
<outlet property="inviterIdLabel" destination="nVa-WN-peC" id="eaJ-L5-OSq"/>
<outlet property="inviterAvatarView" destination="yVi-9K-5iE" id="qBp-MT-d3U"/>
<outlet property="inviterIdLabel" destination="Vw0-9q-U23" id="RxX-Zo-frz"/>
<outlet property="inviterPanelHeight" destination="GXB-6p-EIC" id="VCL-wF-kiK"/>
<outlet property="inviterSeparatorView" destination="GbA-LS-7G8" id="wzH-LB-Hsv"/>
<outlet property="inviterTitleLabel" destination="VxM-1j-hbw" id="v3h-nE-Lhf"/>
<outlet property="inviterView" destination="FZU-zV-W36" id="8jp-jN-dIv"/>
<outlet property="inviterTitleLabel" destination="oZk-F6-3nn" id="1Ih-UD-XYM"/>
<outlet property="joinButton" destination="xQH-D8-TVA" id="PUa-fv-FOK"/>
<outlet property="joinButtonBottomMargin" destination="MhW-nH-ei4" id="w7A-jz-twK"/>
<outlet property="joinButtonTopMargin" destination="MfS-3y-K9f" id="90t-7l-MPe"/>
@@ -198,44 +224,6 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
<view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FZU-zV-W36">
<rect key="frame" x="0.0" y="0.0" width="382" height="36"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fgg-tT-2Aj" customClass="RoomAvatarView" customModule="Element" customModuleProvider="target">
<rect key="frame" x="0.0" y="4" width="32" height="32"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="32" id="J5e-oC-f5x"/>
<constraint firstAttribute="width" constant="32" id="beP-k6-vlv"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="display name invited you" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VxM-1j-hbw">
<rect key="frame" x="44" y="0.0" width="306" height="17"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="@userid:matrix.org" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" adjustsFontForContentSizeCategory="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nVa-WN-peC">
<rect key="frame" x="44" y="19" width="306" height="17"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<viewLayoutGuide key="safeArea" id="bjM-fz-0F7"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="VxM-1j-hbw" secondAttribute="trailing" constant="32" id="6FN-Rx-QoY"/>
<constraint firstItem="VxM-1j-hbw" firstAttribute="top" secondItem="FZU-zV-W36" secondAttribute="top" id="7Cc-cm-Eq2"/>
<constraint firstItem="nVa-WN-peC" firstAttribute="bottom" secondItem="Fgg-tT-2Aj" secondAttribute="bottom" id="7OK-fu-Zab"/>
<constraint firstItem="Fgg-tT-2Aj" firstAttribute="leading" secondItem="FZU-zV-W36" secondAttribute="leading" id="9Pp-5k-lJG"/>
<constraint firstAttribute="trailing" secondItem="nVa-WN-peC" secondAttribute="trailing" constant="32" id="R8o-JD-pIc"/>
<constraint firstItem="Fgg-tT-2Aj" firstAttribute="top" secondItem="FZU-zV-W36" secondAttribute="top" constant="4" id="Y95-n6-4Jk"/>
<constraint firstItem="VxM-1j-hbw" firstAttribute="leading" secondItem="Fgg-tT-2Aj" secondAttribute="trailing" constant="12" id="iHP-Yu-xpD"/>
<constraint firstAttribute="bottom" secondItem="Fgg-tT-2Aj" secondAttribute="bottom" id="oQb-SW-Jq8"/>
<constraint firstItem="nVa-WN-peC" firstAttribute="leading" secondItem="Fgg-tT-2Aj" secondAttribute="trailing" constant="12" id="szL-NW-paa"/>
</constraints>
</view>
</objects>
<point key="canvasLocation" x="-117.39130434782609" y="69.642857142857139"/>
</scene>
@@ -38,9 +38,7 @@ class SpaceDetailViewController: UIViewController {
// MARK: Outlets
@IBOutlet private var inviterView: UIView!
@IBOutlet private weak var inviterContentView: UIView!
@IBOutlet private weak var inviterContentViewHeight: NSLayoutConstraint!
@IBOutlet private weak var inviterPanelHeight: NSLayoutConstraint!
@IBOutlet private weak var inviterAvatarView: RoomAvatarView!
@IBOutlet private weak var inviterTitleLabel: UILabel!
@IBOutlet private weak var inviterIdLabel: UILabel!
@@ -209,36 +207,22 @@ class SpaceDetailViewController: UIViewController {
self.activityPresenter.presentActivityIndicator(on: self.view, animated: true)
}
private func addInviterView() {
// if self.navigationController != nil {
// self.navigationItem.leftItemsSupplementBackButton = true
// self.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: self.inviterView)
// self.inviterContentViewHeight.constant = 0
// } else {
self.inviterContentView.addSubview(inviterView)
inviterView.translatesAutoresizingMaskIntoConstraints = false
inviterView.topAnchor.constraint(equalTo: inviterContentView.topAnchor).isActive = true
inviterView.leadingAnchor.constraint(equalTo: inviterContentView.leadingAnchor).isActive = true
inviterView.trailingAnchor.constraint(equalTo: inviterContentView.trailingAnchor).isActive = true
// }
}
private func renderLoaded(parameters: SpaceDetailLoadedParameters) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
self.title = parameters.displayName
switch parameters.membership {
case .invite:
self.addInviterView()
self.title = VectorL10n.spaceInviteNavTitle
self.joinButton.isHidden = true
self.inviteActionPanel.isHidden = false
case .join:
self.inviterContentViewHeight.constant = 0
self.title = VectorL10n.spaceDetailNavTitle
self.inviterPanelHeight.constant = 0
self.joinButton.setTitle(VectorL10n.open, for: .normal)
self.isJoined = true
default:
self.inviterContentViewHeight.constant = 0
self.title = VectorL10n.spaceDetailNavTitle
self.inviterPanelHeight.constant = 0
}
let avatarViewData = AvatarViewData(matrixItemId: parameters.spaceId,