Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Side menu: Support Dynamic Type.

Browse source
This commit is contained in:
SBiOSoftWhare 2021-06-18 19:27:34 +02:00
parent 4cdca960b3
commit bf2d3c04e9
5 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Riot/Modules/SideMenu/SideMenuActionView.swift
View file

@ -53,6 +53,7 @@ final class SideMenuActionView: UIView, NibOwnerLoadable {
private func commonInit() { private func commonInit() {
self.button.contentHorizontalAlignment = .left self.button.contentHorizontalAlignment = .left
self.button.titleLabel?.lineBreakMode = .byTruncatingTail
} }
convenience init() { convenience init() {

6
Riot/Modules/SideMenu/SideMenuActionView.xib
View file

@ -21,11 +21,17 @@
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pK8-ke-xvx"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pK8-ke-xvx">
<rect key="frame" x="0.0" y="0.0" width="217" height="59"/> <rect key="frame" x="0.0" y="0.0" width="217" height="59"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="44" id="qXw-QN-EC5"/>
</constraints>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<inset key="titleEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/> <inset key="titleEdgeInsets" minX="12" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Settings" image="side_menu_action_icon_settings"> <state key="normal" title="Settings" image="side_menu_action_icon_settings">
<color key="titleColor" systemColor="systemGrayColor"/> <color key="titleColor" systemColor="systemGrayColor"/>
</state> </state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="vc_adjustsFontForContentSizeCategory" value="YES"/>
</userDefinedRuntimeAttributes>
<connections> <connections>
<action selector="buttonAction:" destination="-1" eventType="touchUpInside" id="tNk-fq-wFy"/> <action selector="buttonAction:" destination="-1" eventType="touchUpInside" id="tNk-fq-wFy"/>
</connections> </connections>

2
Riot/Modules/SideMenu/SideMenuVersionView.xib
View file

@ -17,7 +17,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnS-MP-1oq"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnS-MP-1oq">
<rect key="frame" x="0.0" y="0.0" width="414" height="134"/> <rect key="frame" x="0.0" y="0.0" width="414" height="134"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.4.1" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="koz-RT-qji"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.4.1" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="koz-RT-qji">
<rect key="frame" x="0.0" y="30" width="414" height="84"/> <rect key="frame" x="0.0" y="30" width="414" height="84"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/> <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/> <nil key="textColor"/>

4
Riot/Modules/SideMenu/SideMenuViewController.storyboard
View file

@ -39,13 +39,13 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="pj0-XK-IJ2"> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="pj0-XK-IJ2">
<rect key="frame" x="20" y="92" width="374" height="46"/> <rect key="frame" x="20" y="92" width="374" height="46"/>
<subviews> <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="bbo-IX-VUb"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bbo-IX-VUb">
<rect key="frame" x="0.0" y="0.0" width="374" height="24"/> <rect key="frame" x="0.0" y="0.0" width="374" height="24"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/> <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<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="VWw-Gn-nd0"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VWw-Gn-nd0">
<rect key="frame" x="0.0" y="28" width="374" height="18"/> <rect key="frame" x="0.0" y="28" width="374" height="18"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/> <fontDescription key="fontDescription" style="UICTFontTextStyleSubhead"/>
<nil key="textColor"/> <nil key="textColor"/>

5
Riot/Modules/SideMenu/SideMenuViewController.swift
View file

@ -165,7 +165,10 @@ final class SideMenuViewController: UIViewController {
for sideMenuItem in viewData.sideMenuItems { for sideMenuItem in viewData.sideMenuItems {
let sideMenuActionView = SideMenuActionView.instantiate() let sideMenuActionView = SideMenuActionView.instantiate()
sideMenuActionView.translatesAutoresizingMaskIntoConstraints = false sideMenuActionView.translatesAutoresizingMaskIntoConstraints = false
sideMenuActionView.heightAnchor.constraint(equalToConstant: Constants.sideMenuActionViewHeight).isActive = true let heightConstraint = sideMenuActionView.heightAnchor.constraint(equalToConstant: 0)
heightConstraint.priority = .defaultLow
heightConstraint.isActive = true
sideMenuActionView.update(theme: self.theme) sideMenuActionView.update(theme: self.theme)
sideMenuActionView.fill(with: sideMenuItem) sideMenuActionView.fill(with: sideMenuItem)
sideMenuActionView.delegate = self sideMenuActionView.delegate = self