mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Update screen template.
This commit is contained in:
SBiOSoftWhare
parent
dcc38bb62c
commit
25e411e7cd
9 changed files with 64 additions and 59 deletions
|
|
@ -68,10 +68,10 @@ final class FlowTemplateCoordinator: FlowTemplateCoordinatorType {
|
|||
|
||||
// MARK: - TemplateScreenCoordinatorDelegate
|
||||
extension FlowTemplateCoordinator: TemplateScreenCoordinatorDelegate {
|
||||
func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String) {
|
||||
func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithUserDisplayName userDisplayName: String?) {
|
||||
self.delegate?.flowTemplateCoordinatorDidComplete(self)
|
||||
}
|
||||
|
||||
|
||||
func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType) {
|
||||
self.delegate?.flowTemplateCoordinatorDidComplete(self)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,8 +59,8 @@ final class TemplateScreenCoordinator: TemplateScreenCoordinatorType {
|
|||
// MARK: - TemplateScreenViewModelCoordinatorDelegate
|
||||
extension TemplateScreenCoordinator: TemplateScreenViewModelCoordinatorDelegate {
|
||||
|
||||
func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithMessage message: String) {
|
||||
self.delegate?.templateScreenCoordinator(self, didCompleteWithMessage: message)
|
||||
func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithUserDisplayName userDisplayName: String?) {
|
||||
self.delegate?.templateScreenCoordinator(self, didCompleteWithUserDisplayName: userDisplayName)
|
||||
}
|
||||
|
||||
func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType) {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
import Foundation
|
||||
|
||||
protocol TemplateScreenCoordinatorDelegate: class {
|
||||
func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithMessage message: String)
|
||||
func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithUserDisplayName userDisplayName: String?)
|
||||
func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ import Foundation
|
|||
|
||||
/// TemplateScreenViewController view actions exposed to view model
|
||||
enum TemplateScreenViewAction {
|
||||
case sayHello
|
||||
case loadData
|
||||
case complete
|
||||
case cancel
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<device id="retina6_1" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
|
|
@ -15,36 +15,41 @@
|
|||
<objects>
|
||||
<viewController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="V8j-Lb-PgC" customClass="TemplateScreenViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
|
||||
<view key="view" contentMode="scaleToFill" id="EL9-GA-lwo">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9U2-KL-ZVA">
|
||||
<rect key="frame" x="0.0" y="20" width="375" height="647"/>
|
||||
<rect key="frame" x="0.0" y="44" width="414" height="852"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7g-um-WO4">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="500"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="208"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="voD-3Q-ryt">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="500"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="414" height="208"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="A message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxI-mu-qng">
|
||||
<rect key="frame" x="20" y="86" width="335" height="108"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="A message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxI-mu-qng">
|
||||
<rect key="frame" x="20" y="40" width="374" height="18"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="15"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
|
||||
<rect key="frame" x="104" y="368" width="167" height="30"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
|
||||
<rect key="frame" x="20" y="158" width="374" height="30"/>
|
||||
<state key="normal" title="OK"/>
|
||||
<connections>
|
||||
<action selector="okButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="uvI-tt-Nfj"/>
|
||||
<action selector="doneButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="uvI-tt-Nfj"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="bxI-mu-qng" secondAttribute="trailing" constant="20" id="2v5-vH-NEd"/>
|
||||
<constraint firstItem="DOt-5E-FjF" firstAttribute="top" secondItem="bxI-mu-qng" secondAttribute="bottom" constant="100" id="C4r-0w-VXj"/>
|
||||
<constraint firstItem="bxI-mu-qng" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" id="I1A-QW-IJG"/>
|
||||
<constraint firstAttribute="trailing" secondItem="DOt-5E-FjF" secondAttribute="trailing" constant="20" id="NKP-2G-Czj"/>
|
||||
<constraint firstItem="bxI-mu-qng" firstAttribute="top" secondItem="voD-3Q-ryt" secondAttribute="top" constant="40" id="bU7-a2-LIj"/>
|
||||
<constraint firstAttribute="bottom" secondItem="DOt-5E-FjF" secondAttribute="bottom" constant="20" id="dmC-vE-FeB"/>
|
||||
<constraint firstItem="DOt-5E-FjF" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" id="flU-tM-8hK"/>
|
||||
<constraint firstAttribute="width" priority="750" constant="500" id="glD-Sz-73O"/>
|
||||
</constraints>
|
||||
</view>
|
||||
|
|
@ -55,7 +60,6 @@
|
|||
<constraint firstItem="voD-3Q-ryt" firstAttribute="centerX" secondItem="e7g-um-WO4" secondAttribute="centerX" id="P2G-mq-gQW"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="voD-3Q-ryt" secondAttribute="trailing" id="QgV-SO-5yf"/>
|
||||
<constraint firstItem="voD-3Q-ryt" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="e7g-um-WO4" secondAttribute="leading" id="YPo-u1-PtT"/>
|
||||
<constraint firstAttribute="height" constant="500" id="n8g-KW-BYU"/>
|
||||
<constraint firstItem="voD-3Q-ryt" firstAttribute="top" secondItem="e7g-um-WO4" secondAttribute="top" id="rhQ-96-szL"/>
|
||||
</constraints>
|
||||
</view>
|
||||
|
|
@ -63,7 +67,7 @@
|
|||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="e7g-um-WO4" secondAttribute="trailing" id="GyG-Fh-PME"/>
|
||||
<constraint firstItem="e7g-um-WO4" firstAttribute="width" secondItem="9U2-KL-ZVA" secondAttribute="width" id="Ok2-WQ-Zgc"/>
|
||||
<constraint firstAttribute="bottom" secondItem="e7g-um-WO4" secondAttribute="bottom" constant="147" id="Y46-NP-zAc"/>
|
||||
<constraint firstAttribute="bottom" secondItem="e7g-um-WO4" secondAttribute="bottom" id="Y46-NP-zAc"/>
|
||||
<constraint firstItem="e7g-um-WO4" firstAttribute="leading" secondItem="9U2-KL-ZVA" secondAttribute="leading" id="aoV-Yh-AcD"/>
|
||||
<constraint firstItem="e7g-um-WO4" firstAttribute="top" secondItem="9U2-KL-ZVA" secondAttribute="top" id="pFN-bA-SHw"/>
|
||||
</constraints>
|
||||
|
|
@ -79,8 +83,8 @@
|
|||
<viewLayoutGuide key="safeArea" id="bFg-jh-JZB"/>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="messageLabel" destination="bxI-mu-qng" id="pbX-aZ-inC"/>
|
||||
<outlet property="okButton" destination="DOt-5E-FjF" id="ktw-U4-efQ"/>
|
||||
<outlet property="doneButton" destination="DOt-5E-FjF" id="ktw-U4-efQ"/>
|
||||
<outlet property="informationLabel" destination="bxI-mu-qng" id="pbX-aZ-inC"/>
|
||||
<outlet property="scrollView" destination="9U2-KL-ZVA" id="ojG-2y-X7b"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
@IBOutlet private weak var scrollView: UIScrollView!
|
||||
|
||||
@IBOutlet private weak var messageLabel: UILabel!
|
||||
@IBOutlet private weak var okButton: UIButton!
|
||||
@IBOutlet private weak var informationLabel: UILabel!
|
||||
@IBOutlet private weak var doneButton: UIButton!
|
||||
|
||||
// MARK: Private
|
||||
|
||||
|
|
@ -57,8 +57,6 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
// Do any additional setup after loading the view.
|
||||
|
||||
self.title = "Template"
|
||||
|
||||
self.setupViews()
|
||||
self.keyboardAvoider = KeyboardAvoider(scrollViewContainerView: self.view, scrollView: self.scrollView)
|
||||
self.activityPresenter = ActivityIndicatorPresenter()
|
||||
|
|
@ -69,7 +67,7 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
self.viewModel.viewDelegate = self
|
||||
|
||||
self.viewModel.process(viewAction: .sayHello)
|
||||
self.viewModel.process(viewAction: .loadData)
|
||||
}
|
||||
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
|
|
@ -100,11 +98,11 @@ final class TemplateScreenViewController: UIViewController {
|
|||
}
|
||||
|
||||
|
||||
// TODO:
|
||||
self.messageLabel.textColor = theme.textPrimaryColor
|
||||
// TODO: Set view colors here
|
||||
self.informationLabel.textColor = theme.textPrimaryColor
|
||||
|
||||
self.okButton.backgroundColor = theme.backgroundColor
|
||||
theme.applyStyle(onButton: self.okButton)
|
||||
self.doneButton.backgroundColor = theme.backgroundColor
|
||||
theme.applyStyle(onButton: self.doneButton)
|
||||
}
|
||||
|
||||
private func registerThemeServiceDidChangeThemeNotification() {
|
||||
|
|
@ -122,18 +120,19 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
self.navigationItem.rightBarButtonItem = cancelBarButtonItem
|
||||
|
||||
self.title = "Template"
|
||||
|
||||
self.scrollView.keyboardDismissMode = .interactive
|
||||
|
||||
self.messageLabel.text = "VectorL10n.templateScreenTitle"
|
||||
self.messageLabel.isHidden = true
|
||||
self.informationLabel.text = "VectorL10n.templateScreenTitle"
|
||||
}
|
||||
|
||||
private func render(viewState: TemplateScreenViewState) {
|
||||
switch viewState {
|
||||
case .loading:
|
||||
self.renderLoading()
|
||||
case .loaded:
|
||||
self.renderLoaded()
|
||||
case .loaded(let displayName):
|
||||
self.renderLoaded(displayName: displayName)
|
||||
case .error(let error):
|
||||
self.render(error: error)
|
||||
}
|
||||
|
|
@ -141,13 +140,13 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
private func renderLoading() {
|
||||
self.activityPresenter.presentActivityIndicator(on: self.view, animated: true)
|
||||
self.informationLabel.text = "Fetch display name"
|
||||
}
|
||||
|
||||
private func renderLoaded() {
|
||||
private func renderLoaded(displayName: String) {
|
||||
self.activityPresenter.removeCurrentActivityIndicator(animated: true)
|
||||
|
||||
self.messageLabel.text = self.viewModel.message
|
||||
self.messageLabel.isHidden = false
|
||||
self.informationLabel.text = "You display name: \(displayName)"
|
||||
}
|
||||
|
||||
private func render(error: Error) {
|
||||
|
|
@ -158,7 +157,7 @@ final class TemplateScreenViewController: UIViewController {
|
|||
|
||||
// MARK: - Actions
|
||||
|
||||
@IBAction private func okButtonAction(_ sender: Any) {
|
||||
@IBAction private func doneButtonAction(_ sender: Any) {
|
||||
self.viewModel.process(viewAction: .complete)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,10 @@ final class TemplateScreenViewModel: TemplateScreenViewModelType {
|
|||
|
||||
private let session: MXSession
|
||||
|
||||
// MARK: Public
|
||||
private var currentOperation: MXHTTPOperation?
|
||||
private var userDisplayName: String?
|
||||
|
||||
var message: String?
|
||||
// MARK: Public
|
||||
|
||||
weak var viewDelegate: TemplateScreenViewModelViewDelegate?
|
||||
weak var coordinatorDelegate: TemplateScreenViewModelCoordinatorDelegate?
|
||||
|
|
@ -35,46 +36,45 @@ final class TemplateScreenViewModel: TemplateScreenViewModelType {
|
|||
|
||||
init(session: MXSession) {
|
||||
self.session = session
|
||||
self.message = nil
|
||||
}
|
||||
|
||||
deinit {
|
||||
self.cancelOperations()
|
||||
}
|
||||
|
||||
// MARK: - Public
|
||||
|
||||
func process(viewAction: TemplateScreenViewAction) {
|
||||
switch viewAction {
|
||||
case .sayHello:
|
||||
self.setupHelloMessage()
|
||||
case .loadData:
|
||||
self.loadData()
|
||||
case .complete:
|
||||
if let message = self.message {
|
||||
self.coordinatorDelegate?.templateScreenViewModel(self, didCompleteWithMessage: message)
|
||||
}
|
||||
self.coordinatorDelegate?.templateScreenViewModel(self, didCompleteWithUserDisplayName: self.userDisplayName)
|
||||
case .cancel:
|
||||
self.cancelOperations()
|
||||
self.coordinatorDelegate?.templateScreenViewModelDidCancel(self)
|
||||
}
|
||||
}
|
||||
|
||||
// MARK: - Private
|
||||
|
||||
private func setupHelloMessage() {
|
||||
private func loadData() {
|
||||
|
||||
self.update(viewState: .loading)
|
||||
|
||||
// Check first that the user homeserver is federated with the Riot-bot homeserver
|
||||
self.session.matrixRestClient.displayName(forUser: self.session.myUser.userId) { [weak self] (response) in
|
||||
self.currentOperation = self.session.matrixRestClient.displayName(forUser: self.session.myUser.userId) { [weak self] (response) in
|
||||
|
||||
guard let sself = self else {
|
||||
guard let self = self else {
|
||||
return
|
||||
}
|
||||
|
||||
switch response {
|
||||
case .success:
|
||||
sself.message = "Hello \(response.value ?? "you")"
|
||||
sself.update(viewState: .loaded)
|
||||
case .success(let userDisplayName):
|
||||
self.update(viewState: .loaded(userDisplayName))
|
||||
self.userDisplayName = userDisplayName
|
||||
case .failure(let error):
|
||||
sself.update(viewState: .error(error))
|
||||
self.update(viewState: .error(error))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -82,4 +82,8 @@ final class TemplateScreenViewModel: TemplateScreenViewModelType {
|
|||
private func update(viewState: TemplateScreenViewState) {
|
||||
self.viewDelegate?.templateScreenViewModel(self, didUpdateViewState: viewState)
|
||||
}
|
||||
|
||||
private func cancelOperations() {
|
||||
self.currentOperation?.cancel()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,14 +21,12 @@ protocol TemplateScreenViewModelViewDelegate: class {
|
|||
}
|
||||
|
||||
protocol TemplateScreenViewModelCoordinatorDelegate: class {
|
||||
func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithMessage message: String)
|
||||
func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithUserDisplayName userDisplayName: String?)
|
||||
func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType)
|
||||
}
|
||||
|
||||
/// Protocol describing the view model used by `TemplateScreenViewController`
|
||||
protocol TemplateScreenViewModelType {
|
||||
|
||||
var message: String? { get set }
|
||||
protocol TemplateScreenViewModelType {
|
||||
|
||||
var viewDelegate: TemplateScreenViewModelViewDelegate? { get set }
|
||||
var coordinatorDelegate: TemplateScreenViewModelCoordinatorDelegate? { get set }
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ import Foundation
|
|||
/// TemplateScreenViewController view state
|
||||
enum TemplateScreenViewState {
|
||||
case loading
|
||||
case loaded
|
||||
case loaded(_ displayName: String)
|
||||
case error(Error)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue