Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

[BUG] Hide login button when setting is disabled #2049

Merged
rafaelks merged 5 commits into from
Jul 20, 2018
Merged

[BUG] Hide login button when setting is disabled #2049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
86a5e62
Hide login button when settings are disabled
rafaelks Jul 20, 2018
47be362
Code adjustments to avoid another check
rafaelks Jul 20, 2018
e3e2607
Remove the cell & separator
rafaelks Jul 20, 2018
d1626b4
Change size of the cell in case is hidden
rafaelks Jul 20, 2018
a5a8d0a
Change presentation to formsheet
rafaelks Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Rocket.Chat/Controllers/Auth/AuthTableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,14 @@ class AuthTableViewController: BaseTableViewController {

override func viewDidLoad() {
super.viewDidLoad()

title = serverURL.host

guard let settings = serverPublicSettings else { return }

if !settings.isUsernameEmailAuthenticationEnabled {
emailAuthRow.registerButton.isHidden = true
emailAuthRow.isHidden = true
authSeparatorRow.isHidden = true
} else {
emailAuthRow.registerButton.isHidden = settings.registrationForm != .isPublic
}
Expand Down Expand Up @@ -328,7 +330,11 @@ extension AuthTableViewController {

return LoginServiceTableViewCell.rowHeight
case kEmailAuthSection:
return loginServices.count > 0 ? EmailAuthTableViewCell.rowHeightBelowSeparator : EmailAuthTableViewCell.rowHeight
if loginServices.count > 0 {
return emailAuthRow.isHidden ? .leastNonzeroMagnitude : EmailAuthTableViewCell.rowHeightBelowSeparator
}

return EmailAuthTableViewCell.rowHeight
default:
return 0
}
Expand Down
2 changes: 1 addition & 1 deletion Rocket.Chat/Storyboards/Chat.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<simulatedNavigationBarMetrics key="simulatedTopBarMetrics" translucent="NO" prompted="NO"/>
<connections>
<outlet property="activityIndicatorContainer" destination="fbt-TF-z7U" id="Nmz-IG-SvM"/>
<segue destination="hUy-gX-yhf" kind="presentation" identifier="Channel Actions" id="on8-Tf-r4t"/>
<segue destination="hUy-gX-yhf" kind="presentation" identifier="Channel Actions" modalPresentationStyle="formSheet" id="on8-Tf-r4t"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="IA8-7w-0ga" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down