felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-23 18:12:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'element_4087' into element_4134

Browse Source
This commit is contained in:
Gil Eluard
2021-04-01 08:48:08 +02:00
parent dcc5b9cccb 2c83494d22
commit e3596123a5
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Views/InputToolbar/RoomActionsBar.swift
+3 -2
View File
@@ -77,6 +77,7 @@ import UIKit
var currentX: CGFloat = 0
for button in actionButtons {
button.transform = CGAffineTransform.identity
button.frame = CGRect(x: currentX, y: 0, width: self.bounds.height, height: self.bounds.height)
currentX = button.frame.maxX + itemSpacing
}
@@ -98,7 +99,7 @@ import UIKit
button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
}
for (index, button) in actionButtons.enumerated() {
UIView.animate(withDuration: 0.32, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
UIView.animate(withDuration: 0.38, delay: 0.05 * Double(index), usingSpringWithDamping: 0.5, initialSpringVelocity: 7, options: .curveEaseInOut) {
button.transform = CGAffineTransform.identity
} completion: { (finished) in
completion?(finished)
@@ -106,7 +107,7 @@ import UIKit
}
} else {
for (index, button) in actionButtons.enumerated() {
UIView.animate(withDuration: 0.2, delay: 0.05 * Double(index), options: .curveEaseInOut) {
UIView.animate(withDuration: 0.3, delay: 0.05 * Double(index), options: .curveEaseInOut) {
button.transform = CGAffineTransform(translationX: 0, y: self.bounds.height)
} completion: { (finished) in
completion?(finished)
Riot/Modules/Room/Views/Title/RoomTitleView.h
+2
View File
@@ -44,6 +44,8 @@
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *missedDiscussionsBadgeLabelLeadingConstraint;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *pictureViewHeightConstraint;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *pictureViewWidthConstraint;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *dotViewCenterXConstraint;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *dotViewCenterYConstraint;
/**
The room preview data may be used when mxRoom instance is not available
Riot/Modules/Room/Views/Title/RoomTitleView.m
+5 -1
View File
@@ -147,6 +147,8 @@
self.pictureViewHeightConstraint.constant = 28;
self.displayNameTextField.font = [UIFont systemFontOfSize:14 weight:UIFontWeightMedium];
self.typingLabel.font = [UIFont systemFontOfSize:10];
self.dotViewCenterXConstraint.constant = 3;
self.dotViewCenterYConstraint.constant = -2;
}
else
{
@@ -156,7 +158,9 @@
self.pictureViewHeightConstraint.constant = 32;
self.displayNameTextField.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
self.typingLabel.font = [UIFont systemFontOfSize:12];
}
self.dotViewCenterXConstraint.constant = 0;
self.dotViewCenterYConstraint.constant = -1;
}
}
- (void)setTypingNotificationString:(NSString *)typingNotificationString
Riot/Modules/Room/Views/Title/RoomTitleView.xib
+3 -1
View File
@@ -71,7 +71,7 @@
<constraint firstItem="6uH-I3-RQg" firstAttribute="leading" secondItem="LDd-c1-ILP" secondAttribute="trailing" constant="12" id="0pG-0z-gpD"/>
<constraint firstItem="LDd-c1-ILP" firstAttribute="centerY" secondItem="BkF-x3-7fX" secondAttribute="centerY" id="33h-dC-S1U"/>
<constraint firstAttribute="bottom" secondItem="sD9-l7-azQ" secondAttribute="bottom" id="4rX-5O-LrO"/>
<constraint firstItem="yTB-Be-bLN" firstAttribute="centerX" secondItem="SUm-iW-DRR" secondAttribute="trailing" id="7H4-kh-c2g"/>
<constraint firstItem="yTB-Be-bLN" firstAttribute="centerX" secondItem="SUm-iW-DRR" secondAttribute="leading" id="7H4-kh-c2g"/>
<constraint firstItem="sD9-l7-azQ" firstAttribute="leading" secondItem="BkF-x3-7fX" secondAttribute="leading" id="AJc-Aa-sht"/>
<constraint firstItem="SUm-iW-DRR" firstAttribute="centerY" secondItem="BkF-x3-7fX" secondAttribute="centerY" id="Blv-SJ-r6v"/>
<constraint firstItem="Ky3-cy-HAx" firstAttribute="bottom" secondItem="LDd-c1-ILP" secondAttribute="bottom" id="HZy-1x-eyX"/>
@@ -92,6 +92,8 @@
<outlet property="displayNameCenterYConstraint" destination="fvR-gc-5Ls" id="hzE-KD-Am7"/>
<outlet property="displayNameTextField" destination="6uH-I3-RQg" id="MfX-LQ-C2K"/>
<outlet property="dotView" destination="yTB-Be-bLN" id="nr1-Tf-kms"/>
<outlet property="dotViewCenterXConstraint" destination="7H4-kh-c2g" id="bAI-uZ-kp7"/>
<outlet property="dotViewCenterYConstraint" destination="ZVB-7x-P0K" id="Byk-Fk-AT0"/>
<outlet property="missedDiscussionsBadgeLabel" destination="SUm-iW-DRR" id="rZo-yq-GyJ"/>
<outlet property="missedDiscussionsBadgeLabelLeadingConstraint" destination="a67-jx-TI9" id="l0M-sE-q28"/>
<outlet property="pictureView" destination="LDd-c1-ILP" id="0bS-2V-Sj7"/>