Merge develop into element_3836

This commit is contained in:
SBiOSoftWhare
2020-11-30 17:54:16 +01:00
16 changed files with 379 additions and 105 deletions
@@ -16,19 +16,19 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W21-Nb-gxV">
<rect key="frame" x="0.0" y="38" width="320" height="404"/>
<rect key="frame" x="0.0" y="-11" width="320" height="471"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" image="favourites_empty_screen_artwork" translatesAutoresizingMaskIntoConstraints="NO" id="GiH-8q-wk4">
<rect key="frame" x="20" y="0.0" width="280" height="245"/>
<rect key="frame" x="20" y="0.0" width="280" height="312"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Favourite rooms and people" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hPm-Rh-n4I">
<rect key="frame" x="20" y="285" width="280" height="26.5"/>
<rect key="frame" x="20" y="352" width="280" height="26.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="22"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalCompressionResistancePriority="751" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qtf-2C-k84">
<rect key="frame" x="20" y="327.5" width="280" height="76.5"/>
<rect key="frame" x="20" y="394.5" width="280" height="76.5"/>
<string key="text">You can favourite a few ways - the quickest is just to press and hold. Tap the star and theyll automatically appear here for safe keeping.</string>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -74,7 +74,7 @@
</view>
</objects>
<resources>
<image name="favourites_empty_screen_artwork" width="324" height="245"/>
<image name="favourites_empty_screen_artwork" width="420" height="312"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>