zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 19 Releases Wiki Activity

Show menu for signup-speed-selection (#690)

This commit is contained in:
Nathan Mattes 2022-12-22 19:20:29 +01:00
parent f974fc9f05
commit 9806c2aa84
3 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mastodon/Scene/Onboarding/PickServer/CategoryPickerSection.swift
View File

@ -25,6 +25,7 @@ extension CategoryPickerSection {
cell.titleLabel.text = item.title
cell.delegate = buttonDelegate
cell.item = item
let isLanguage = (item == .language(language: nil))
let isSignupSpeed = (item == .signupSpeed(manuallyReviewed: nil))

2
Mastodon/Scene/Onboarding/PickServer/CollectionViewCell/PickServerCategoryCollectionViewCell.swift
View File

@ -20,6 +20,8 @@ class PickServerCategoryCollectionViewCell: UICollectionViewCell {
static let reuseIdentifier = "PickServerCategoryCollectionViewCell"
weak var delegate: PickServerCategoryCollectionViewCellDelegate?
var item: CategoryPickerItem?
let titleLabel: UILabel = {
let label = UILabel()
label.textAlignment = .center

64
Mastodon/Scene/Onboarding/PickServer/MastodonPickServerViewModel.swift
View File

@ -289,26 +289,56 @@ extension MastodonPickServerViewModel: TMBarDataSource {
extension MastodonPickServerViewModel: PickServerCategoryCollectionViewCellDelegate {
func didPressMenuButton(in cell: PickServerCategoryCollectionViewCell) {
guard allLanguages.value.isNotEmpty else { return }
guard let item = cell.item else { return }
let allLanguagesAction = UIAction(title: "All") { _ in
self.selectedLanguage.value = nil
cell.titleLabel.text = L10n.Scene.ServerPicker.Button.language
}
switch item {
case .all, .category(_):
return
case .language(_):
guard allLanguages.value.isNotEmpty else { return }
let languageActions = allLanguages.value.compactMap { language in
UIAction(title: language.language ?? language.locale) { action in
self.selectedLanguage.value = language.locale
cell.titleLabel.text = language.language
//FIXME: @zeitschlag localize
let allLanguagesAction = UIAction(title: "All") { _ in
self.selectedLanguage.value = nil
cell.titleLabel.text = L10n.Scene.ServerPicker.Button.language
}
let languageActions = allLanguages.value.compactMap { language in
UIAction(title: language.language ?? language.locale) { action in
self.selectedLanguage.value = language.locale
cell.titleLabel.text = language.language
}
}
var allActions = [allLanguagesAction]
allActions.append(contentsOf: languageActions)
let languageMenu = UIMenu(title: L10n.Scene.ServerPicker.Button.language,
children: allActions)
cell.menuButton.menu = languageMenu
case .signupSpeed(_):
let doesntMatterAction = UIAction(title: L10n.Scene.ServerPicker.SignupSpeed.all) { action in
self.manualApprovalRequired.value = nil
cell.titleLabel.text = action.title
}
let manualApprovalAction = UIAction(title: L10n.Scene.ServerPicker.SignupSpeed.manuallyReviewed) { action in
self.manualApprovalRequired.value = true
cell.titleLabel.text = action.title
}
let instantSignupAction = UIAction(title: L10n.Scene.ServerPicker.SignupSpeed.instant) { action in
self.manualApprovalRequired.value = false
cell.titleLabel.text = action.title
}
let signupSpeedMenu = UIMenu(title: L10n.Scene.ServerPicker.Button.signupSpeed,
children: [doesntMatterAction, manualApprovalAction, instantSignupAction])
cell.menuButton.menu = signupSpeedMenu
}
var allActions = [allLanguagesAction]
allActions.append(contentsOf: languageActions)
let languageMenu = UIMenu(title: L10n.Scene.ServerPicker.Button.language,
children: allActions)
cell.menuButton.menu = languageMenu
}
}