Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-02-03 02:37:37 +01:00
Code Issues Projects Releases Wiki Activity

Add language-selector (#690)

Browse Source 
For now, it searches for German servers only because.
This commit is contained in:
Nathan Mattes 2022-12-20 18:42:57 +01:00
parent 6b0547d3d4
commit 7c8c5fe214
8 changed files with 47 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Localization/app.json
View File

@ -267,6 +267,7 @@
"server_picker": {
"title": "Pick Server",
"button": {
"language": "Language",
"category": {
"all": "All",
"all_accessiblity_description": "Category: All",

22
Mastodon/Scene/Onboarding/PickServer/CategoryPickerItem.swift
View File

@ -13,6 +13,7 @@ import MastodonLocalization
/// Note: update Equatable when change case
enum CategoryPickerItem {
case all
case language(language: String?)
case category(category: Mastodon.Entity.Category)
}
@ -22,6 +23,12 @@ extension CategoryPickerItem {
switch self {
case .all:
return L10n.Scene.ServerPicker.Button.Category.all
case .language(let language):
if let language {
return language
} else {
return L10n.Scene.ServerPicker.Button.language
}
case .category(let category):
switch category.category {
case .academia:
@ -58,6 +65,13 @@ extension CategoryPickerItem {
switch self {
case .all:
return L10n.Scene.ServerPicker.Button.Category.allAccessiblityDescription
case .language(let language):
if let language {
return language
} else {
return L10n.Scene.ServerPicker.Button.language
}
case .category(let category):
switch category.category {
case .academia:
@ -98,6 +112,8 @@ extension CategoryPickerItem: Equatable {
return true
case (.category(let categoryLeft), .category(let categoryRight)):
return categoryLeft.category.rawValue == categoryRight.category.rawValue
case (.language(let languageLeft), .language(let languageRight)):
return languageLeft == languageRight
default:
return false
}
@ -109,6 +125,12 @@ extension CategoryPickerItem: Hashable {
switch self {
case .all:
hasher.combine(String(describing: CategoryPickerItem.all.self))
case .language(let language):
if let language {
return hasher.combine(language)
} else {
return hasher.combine("no_language_selected")
}
case .category(let category):
hasher.combine(category.category.rawValue)
}

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

@ -22,6 +22,10 @@ extension CategoryPickerSection {
guard let _ = dependency else { return nil }
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: String(describing: PickServerCategoryCollectionViewCell.self), for: indexPath) as! PickServerCategoryCollectionViewCell
cell.categoryView.titleLabel.text = item.title
let isLanguage = (item == .language(language: nil))
cell.categoryView.chevron.isHidden = (isLanguage == false)
cell.observe(\.isSelected, options: [.initial, .new]) { cell, _ in
let textColor: UIColor
@ -41,6 +45,7 @@ extension CategoryPickerSection {
cell.categoryView.backgroundColor = backgroundColor
cell.categoryView.titleLabel.textColor = textColor
cell.categoryView.layer.borderColor = borderColor.cgColor
cell.categoryView.chevron.tintColor = textColor
}
.store(in: &cell.observations)

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

@ -391,6 +391,7 @@ extension MastodonPickServerViewController: PickServerServerSectionTableHeaderVi
func pickServerServerSectionTableHeaderView(_ headerView: PickServerServerSectionTableHeaderView, collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
guard let diffableDataSource = headerView.diffableDataSource else { return }
let item = diffableDataSource.itemIdentifier(for: indexPath)
//TODO: @zeitschlag Consider language etc. also: show menu
viewModel.selectCategoryItem.value = item ?? .all
}
}

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

@ -33,6 +33,7 @@ class MastodonPickServerViewModel: NSObject {
var categoryPickerItems: [CategoryPickerItem] = {
var items: [CategoryPickerItem] = []
items.append(.all)
items.append(.language(language: nil))
items.append(contentsOf: APIService.stubCategories().map { CategoryPickerItem.category(category: $0) })
return items
}()
@ -156,6 +157,9 @@ extension MastodonPickServerViewModel {
switch selectCategoryItem {
case .all:
return MastodonPickServerViewModel.filterServers(servers: indexedServers, category: nil, searchText: searchText)
case .language(let language):
//TODO: @zeitschlag Cache selected language
return MastodonPickServerViewModel.filterServers(servers: indexedServers, language: "de", category: nil, searchText: searchText)
case .category(let category):
return MastodonPickServerViewModel.filterServers(servers: indexedServers, category: category.category.rawValue, searchText: searchText)
}
@ -210,16 +214,16 @@ extension MastodonPickServerViewModel {
}
}
extension MastodonPickServerViewModel {
private static func filterServers(servers: [Mastodon.Entity.Server], category: String?, searchText: String) -> [Mastodon.Entity.Server] {
return servers
// 1. Filter the category
private static func filterServers(servers: [Mastodon.Entity.Server], language: String? = nil, category: String?, searchText: String) -> [Mastodon.Entity.Server] {
let filteredServers = servers
// 1. Filter the category
.filter {
guard let category = category else { return true }
return $0.category.caseInsensitiveCompare(category) == .orderedSame
}
// 2. Filter the searchText
// 2. Filter the searchText
.filter {
let searchText = searchText.trimmingCharacters(in: .whitespacesAndNewlines)
guard !searchText.isEmpty else {
@ -227,6 +231,11 @@ extension MastodonPickServerViewModel {
}
return $0.domain.lowercased().contains(searchText.lowercased())
}
.filter {
guard let language else { return true }
return $0.language.lowercased() == language.lowercased()
}
return filteredServers
}
}

2
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -1205,6 +1205,8 @@ public enum L10n {
/// Pick server
public static let title = L10n.tr("Localizable", "Scene.ServerPicker.Title", fallback: "Pick server")
public enum Button {
/// Language
public static let language = L10n.tr("Localizable", "Scene.ServerPicker.Button.Language", fallback: "Language")
/// See Less
public static let seeLess = L10n.tr("Localizable", "Scene.ServerPicker.Button.SeeLess", fallback: "See Less")
/// See More

1
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -428,6 +428,7 @@ uploaded to Mastodon.";
"Scene.ServerPicker.Button.Category.Tech" = "tech";
"Scene.ServerPicker.Button.SeeLess" = "See Less";
"Scene.ServerPicker.Button.SeeMore" = "See More";
"Scene.ServerPicker.Button.Language" = "Language";
"Scene.ServerPicker.EmptyState.BadNetwork" = "Something went wrong while loading the data. Check your internet connection.";
"Scene.ServerPicker.EmptyState.FindingServers" = "Finding available servers...";
"Scene.ServerPicker.EmptyState.NoResults" = "No results";

1
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
View File

@ -419,6 +419,7 @@ uploaded to Mastodon.";
"Scene.ServerPicker.Button.Category.Tech" = "tech";
"Scene.ServerPicker.Button.SeeLess" = "See Less";
"Scene.ServerPicker.Button.SeeMore" = "See More";
"Scene.ServerPicker.Button.Language" = "Language";
"Scene.ServerPicker.EmptyState.BadNetwork" = "Something went wrong while loading the data. Check your internet connection.";
"Scene.ServerPicker.EmptyState.FindingServers" = "Finding available servers...";
"Scene.ServerPicker.EmptyState.NoResults" = "No results";