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

Merge branch 'develop' into xcode11

Browse source
This commit is contained in:
SBiOSoftWhare 2020-05-29 09:51:51 +02:00
commit 73ab5fe685
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -31,6 +31,7 @@ Improvements:
Bug fix:
* AuthenticationViewController: Adapt UIWebView changes in MatrixKit (PR #3242).
* Share extension & Siri intent: Do not fail when sending to locally unverified devices (#3252).
* CountryPickerVC: Search field is invisible in dark theme (#3219).
Changes in 0.11.4 (2020-05-08)
===============================================

3
Riot/Categories/UILabel.swift
View file

@ -29,7 +29,8 @@ extension UILabel {
self.attributedText = attributeString
}
// Fix multiline label height with auto layout. After performing orientation multiline label text appears on one line. For more information see https://www.objc.io/issues/3-views/advanced-auto-layout-toolbox/#intrinsic-content-size-of-multi-line-text
// Fix multiline label height with auto layout. After performing orientation multiline label text appears on one line.
// For more information see https://www.objc.io/issues/3-views/advanced-auto-layout-toolbox/#intrinsic-content-size-of-multi-line-text
@objc func vc_fixMultilineHeight() {
let width = self.frame.size.width

2
Riot/Modules/KeyVerification/User/SessionsStatus/UserVerificationSessionsStatusViewModel.swift
View file

@ -114,7 +114,7 @@ final class UserVerificationSessionsStatusViewModel: UserVerificationSessionsSta
let httpOperation: MXHTTPOperation?
httpOperation = self.session.crypto.downloadKeys([self.userId], forceDownload: false, success: { ( usersDeviceMap: MXUsersDevicesMap<MXDeviceInfo>?, usersCrossSigningMap: [String : MXCrossSigningInfo]?) in
httpOperation = self.session.crypto.downloadKeys([self.userId], forceDownload: false, success: { ( usersDeviceMap: MXUsersDevicesMap<MXDeviceInfo>?, usersCrossSigningMap: [String: MXCrossSigningInfo]?) in
let sessionsViewData: [UserVerificationSessionStatusViewData]

11
Riot/Modules/Settings/PhoneCountry/CountryPickerViewController.m
View file

@ -51,9 +51,6 @@
// Hide line separators of empty cells
self.tableView.tableFooterView = [[UIView alloc] init];
// Note: UISearchDisplayController is deprecated in iOS 8.
// MXKCountryPickerViewController should use UISearchController to manage the presentation of a search bar and display search results.
self.searchDisplayController.searchResultsTableView.tableFooterView = [[UIView alloc] init];
// Add a top view which will be displayed in case of vertical bounce.
CGFloat height = self.tableView.frame.size.height;
@ -76,13 +73,15 @@
self.activityIndicator.backgroundColor = ThemeService.shared.theme.overlayBackgroundColor;
[ThemeService.shared.theme applyStyleOnSearchBar:self.searchBar];
// Use the primary bg color for the table view in plain style.
self.tableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
self.tableView.separatorColor = ThemeService.shared.theme.lineBreakColor;
topview.backgroundColor = ThemeService.shared.theme.backgroundColor;
self.searchDisplayController.searchResultsTableView.backgroundColor = self.tableView.backgroundColor;
if (self.searchController.searchBar)
{
[ThemeService.shared.theme applyStyleOnSearchBar:self.searchController.searchBar];
}
if (self.tableView.dataSource)
{