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

Merge branch 'develop' into privacy

Browse Source
This commit is contained in:
manuroe
2019-10-04 11:56:55 +02:00
committed by GitHub
parent 332ceaa8df bc2e1433fe
commit 05c8a85a4b
45 changed files with 2273 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
Riot/Modules/Room/RoomViewController.m
View File

@@ -123,7 +123,7 @@
#import "Riot-Swift.h"
@interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelegate, RoomTitleViewTapGestureDelegate, RoomParticipantsViewControllerDelegate, MXKRoomMemberDetailsViewControllerDelegate, ContactsTableViewControllerDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate,
@interface RoomViewController () <UISearchBarDelegate, UIGestureRecognizerDelegate, UIScrollViewAccessibilityDelegate, RoomTitleViewTapGestureDelegate, RoomParticipantsViewControllerDelegate, MXKRoomMemberDetailsViewControllerDelegate, ContactsTableViewControllerDelegate, MXServerNoticesDelegate, RoomContextualMenuViewControllerDelegate,
ReactionsMenuViewModelCoordinatorDelegate, EditHistoryCoordinatorBridgePresenterDelegate, MXKDocumentPickerPresenterDelegate, EmojiPickerCoordinatorBridgePresenterDelegate,
ReactionHistoryCoordinatorBridgePresenterDelegate, CameraPresenterDelegate, MediaPickerCoordinatorBridgePresenterDelegate>
{
@@ -813,6 +813,92 @@
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
}
#pragma mark - Accessibility
// Handle scrolling when VoiceOver is on because it does not work well if we let the system do:
// VoiceOver loses the focus on the tableview
- (BOOL)accessibilityScroll:(UIAccessibilityScrollDirection)direction
{
BOOL canScroll = YES;
// Scroll by one page
CGFloat tableViewHeight = self.bubblesTableView.frame.size.height;
CGPoint offset = self.bubblesTableView.contentOffset;
switch (direction)
{
case UIAccessibilityScrollDirectionUp:
offset.y -= tableViewHeight;
break;
case UIAccessibilityScrollDirectionDown:
offset.y += tableViewHeight;
break;
default:
break;
}
if (offset.y < 0 && ![self.roomDataSource.timeline canPaginate:MXTimelineDirectionBackwards])
{
// Can't paginate more. Let's stick on the first item
UIView *focusedView = [self firstCellWithAccessibilityDataInCells:self.bubblesTableView.visibleCells.objectEnumerator];
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, focusedView);
canScroll = NO;
}
else if (offset.y > self.bubblesTableView.contentSize.height - tableViewHeight
&& ![self.roomDataSource.timeline canPaginate:MXTimelineDirectionForwards])
{
// Can't paginate more. Let's stick on the last item with accessibility
UIView *focusedView = [self firstCellWithAccessibilityDataInCells:self.bubblesTableView.visibleCells.reverseObjectEnumerator];
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, focusedView);
canScroll = NO;
}
else
{
// Disable VoiceOver while scrolling
self.bubblesTableView.accessibilityElementsHidden = YES;
[self.bubblesTableView setContentOffset:offset animated:NO];
NSEnumerator<UITableViewCell*> *cells;
if (direction == UIAccessibilityScrollDirectionUp)
{
cells = self.bubblesTableView.visibleCells.objectEnumerator;
}
else
{
cells = self.bubblesTableView.visibleCells.reverseObjectEnumerator;
}
UIView *cell = [self firstCellWithAccessibilityDataInCells:cells];
self.bubblesTableView.accessibilityElementsHidden = NO;
// Force VoiceOver to focus on a visible item
UIAccessibilityPostNotification(UIAccessibilityLayoutChangedNotification, cell);
}
// If we cannot scroll, let VoiceOver indicates the border
return canScroll;
}
- (UIView*)firstCellWithAccessibilityDataInCells:(NSEnumerator<UITableViewCell*>*)cells
{
UIView *view;
for (UITableViewCell *cell in cells)
{
if (![cell isKindOfClass:[RoomEmptyBubbleCell class]])
{
view = cell;
break;
}
}
return view;
}
#pragma mark - Override MXKRoomViewController
- (void)onMatrixSessionChange
@@ -1372,12 +1458,16 @@
icon = [icon imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
self.navigationItem.rightBarButtonItems[1].image = icon;
self.navigationItem.rightBarButtonItems[1].accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_integrations", @"Vector", nil);
}
else
{
// Reset original icon
self.navigationItem.rightBarButtonItems[1].image = [UIImage imageNamed:@"apps-icon"];
self.navigationItem.rightBarButtonItems[1].accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_integrations", @"Vector", nil);
}
self.navigationItem.rightBarButtonItems.firstObject.accessibilityLabel = NSLocalizedStringFromTable(@"room_accessibility_search", @"Vector", nil);
}
// Do not change title view class here if the expanded header is visible.