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

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
This commit is contained in:
Gil Eluard
2022-03-04 13:38:18 +01:00
parent dfda5f09d9 92d04ed872
commit da9c921efb
285 changed files with 18032 additions and 18206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
+18 -13
View File
@@ -40,7 +40,8 @@ final class RoomInfoListViewController: UIViewController {
private var viewModel: RoomInfoListViewModelType!
private var theme: Theme!
private var errorPresenter: MXKErrorPresentation!
private var activityPresenter: ActivityIndicatorPresenterType!
private var indicatorPresenter: UserIndicatorTypePresenterProtocol!
private var loadingIndicator: UserIndicator?
private var isRoomDirect: Bool = false
private var screenTimer = AnalyticsScreenTimer(screen: .roomDetails)
@@ -116,14 +117,9 @@ final class RoomInfoListViewController: UIViewController {
// Do any additional setup after loading the view.
self.setupViews()
if BuildSettings.useAppUserIndicators {
self.activityPresenter = FullscreenActivityIndicatorPresenter(
label: VectorL10n.roomParticipantsLeaveProcessing,
viewController: self
)
} else {
self.activityPresenter = ActivityIndicatorPresenter()
}
self.indicatorPresenter = UserIndicatorTypePresenter(presentingViewController: self)
self.errorPresenter = MXKErrorAlertPresentation()
self.registerThemeServiceDidChangeThemeNotification()
@@ -152,7 +148,7 @@ final class RoomInfoListViewController: UIViewController {
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
screenTimer.stop()
activityPresenter.removeCurrentActivityIndicator(animated: animated)
stopLoading()
}
override func viewWillTransition(to size: CGSize, with coordinator: UIViewControllerTransitionCoordinator) {
@@ -272,19 +268,28 @@ final class RoomInfoListViewController: UIViewController {
}
private func renderLoading() {
self.activityPresenter.presentActivityIndicator(on: self.view, animated: true)
loadingIndicator = indicatorPresenter.present(
.loading(
label: VectorL10n.roomParticipantsLeaveProcessing,
isInteractionBlocking: true
)
)
}
private func renderLoaded(viewData: RoomInfoListViewData) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
stopLoading()
self.updateSections(with: viewData)
}
private func render(error: Error) {
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
stopLoading()
self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
}
private func stopLoading() {
loadingIndicator?.cancel()
}
// MARK: - Actions
@objc private func closeButtonTapped(_ sender: Any) {
Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
-15
View File
@@ -28,21 +28,6 @@ class RoomInfoBasicView: UIView {
@IBOutlet private weak var mainStackView: UIStackView!
@IBOutlet private weak var avatarImageView: MXKImageView!
@IBOutlet private weak var shadowView: UIView! {
didSet {
let shadowPath = UIBezierPath(roundedRect: shadowView.bounds, cornerRadius: 0)
let layer = CALayer()
layer.shadowPath = shadowPath.cgPath
layer.shadowColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.12).cgColor
layer.shadowOpacity = 1
layer.shadowRadius = 25
layer.shadowOffset = CGSize(width: 0, height: 4)
layer.bounds = shadowView.bounds
layer.position = shadowView.center
shadowView.layer.addSublayer(layer)
}
}
@IBOutlet private weak var badgeImageView: UIImageView!
@IBOutlet private weak var roomNameLabel: UILabel!
@IBOutlet private weak var roomAddressLabel: UILabel!
Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.xib
+3 -4
View File
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -164,7 +164,6 @@
<outlet property="securityContainerView" destination="l54-5L-xAv" id="Duy-QA-wrD"/>
<outlet property="securityInformationLabel" destination="HAS-Tr-iTE" id="GZC-gT-q2z"/>
<outlet property="securityTitleLabel" destination="peB-51-q5w" id="hbl-K6-AbE"/>
<outlet property="shadowView" destination="szu-r5-TIX" id="LDd-uy-FAG"/>
<outlet property="topicContainerView" destination="NSk-JY-5iY" id="YCo-cp-dbU"/>
<outlet property="topicTitleLabel" destination="cTV-D7-Uha" id="nt9-MZ-4t7"/>
</connections>
@@ -173,7 +172,7 @@
</objects>
<designables>
<designable name="DCx-MH-TSC">
<size key="intrinsicContentSize" width="-1" height="34"/>
<size key="intrinsicContentSize" width="98.5" height="34"/>
</designable>
</designables>
<resources>