felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-02 14:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged element 1.8.10

Browse Source
This commit is contained in:
Arnfried Griesert
2022-05-03 12:48:01 +02:00
parent f3c547da4b 38051ec88b
commit f1becdd999
1235 changed files with 50869 additions and 23132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
+12 -21
View File
@@ -105,7 +105,7 @@
@property(nonatomic, strong) UserVerificationCoordinatorBridgePresenter *userVerificationCoordinatorBridgePresenter;
@property(nonatomic) AnalyticsScreenTimer *screenTimer;
@property(nonatomic) AnalyticsScreenTracker *screenTracker;
@end
@@ -143,7 +143,7 @@
// Keep visible the status bar by default.
isStatusBarHidden = NO;
self.screenTimer = [[AnalyticsScreenTimer alloc] initWithScreen:AnalyticsScreenUser];
self.screenTracker = [[AnalyticsScreenTracker alloc] initWithScreen:AnalyticsScreenUser];
}
- (void)viewDidLoad
@@ -243,6 +243,8 @@
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[self.screenTracker trackScreen];
[self userInterfaceThemeDidChange];
@@ -266,18 +268,6 @@
self.bottomImageView.hidden = YES;
}
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
[self.screenTimer start];
}
- (void)viewDidDisappear:(BOOL)animated
{
[super viewDidDisappear:animated];
[self.screenTimer stop];
}
- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIViewControllerTransitionCoordinator>)coordinator
{
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
@@ -351,7 +341,7 @@
return [AvatarGenerator generateAvatarForMatrixItem:self.mxRoomMember.userId withDisplayName:self.mxRoomMember.displayname];
}
return [MXKTools paintImage:[UIImage imageNamed:@"placeholder"]
return [MXKTools paintImage:AssetImages.placeholder.image
withColor:ThemeService.shared.theme.tintColor];
}
@@ -478,6 +468,7 @@
- (void)showRoomWithId:(NSString*)roomId
{
Analytics.shared.viewRoomTrigger = AnalyticsViewRoomTriggerRoomMemberDetail;
[[AppDelegate theDelegate] showRoom:roomId andEventId:nil withMatrixSession:self.mainSession];
}
@@ -646,7 +637,7 @@
}
// Check whether the option Ignore may be presented
if (RiotSettings.shared.roomMemberScreenShowIgnore && self.mxRoomMember.membership == MXMembershipJoin)
if (RiotSettings.shared.roomMemberScreenShowIgnore)
{
// is he already ignored ?
if (![self.mainSession isUserIgnored:self.mxRoomMember.userId])
@@ -999,7 +990,7 @@
}
else
{
roomCell.avatarImageView.image = [UIImage imageNamed:@"start_chat"];
roomCell.avatarImageView.image = AssetImages.startChat.image;
roomCell.avatarImageView.defaultBackgroundColor = [UIColor clearColor];
roomCell.avatarImageView.userInteractionEnabled = NO;
roomCell.titleLabel.text = [VectorL10n roomParticipantsActionStartNewChat];
@@ -1171,7 +1162,7 @@
textField.keyboardType = UIKeyboardTypeDefault;
}];
[currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -1183,7 +1174,7 @@
}]];
[currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n ban]
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n ban]
style:UIAlertActionStyleDefault handler:^(UIAlertAction * action) {
if (weakSelf)
@@ -1235,7 +1226,7 @@
textField.keyboardType = UIKeyboardTypeDefault;
}];
[currentAlert addAction:[UIAlertAction actionWithTitle:[MatrixKitL10n cancel]
[currentAlert addAction:[UIAlertAction actionWithTitle:[VectorL10n cancel]
style:UIAlertActionStyleDefault
handler:^(UIAlertAction * action) {
@@ -1367,7 +1358,7 @@
__block MXKImageView * avatarFullScreenView = [[MXKImageView alloc] initWithFrame:CGRectZero];
avatarFullScreenView.stretchable = YES;
[avatarFullScreenView setRightButtonTitle:[MatrixKitL10n ok]
[avatarFullScreenView setRightButtonTitle:[VectorL10n ok]
handler:^(MXKImageView* imageView, NSString* buttonTitle) {
MXStrongifyAndReturnIfNil(self);