MESSENGER-2762 Initial Merge

This commit is contained in:
Frank Rotermund
2022-03-17 15:51:23 +01:00
parent ecae8d618f
commit c2108a2178
384 changed files with 17708 additions and 1928 deletions

View File

@@ -2,6 +2,7 @@
// $ createScreen.sh SetPinCode/SetupBiometrics SetupBiometrics
/*
Copyright 2020 New Vector Ltd
Copyright (c) 2021 BWI GmbH
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -113,18 +114,21 @@ final class SetupBiometricsViewController: UIViewController {
}
private func showSkipButton() {
self.navigationController?.navigationBar.isHidden = false
self.navigationItem.rightBarButtonItem = MXKBarButtonItem(title: VectorL10n.skip, style: .plain) { [weak self] in
self?.skipCancelButtonAction()
}
}
private func showCancelButton() {
self.navigationController?.navigationBar.isHidden = false
self.navigationItem.rightBarButtonItem = MXKBarButtonItem(title: VectorL10n.cancel, style: .plain) { [weak self] in
self?.skipCancelButtonAction()
}
}
private func hideSkipCancelButton() {
self.navigationController?.navigationBar.isHidden = true
self.navigationItem.rightBarButtonItem = nil
}