Mastodon
/
mastodon-app-ufficiale-iphone-ios
mirror of https://github.com/mastodon/mastodon-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disable "Support"-setting for now (IOS-14)

This commit is contained in:
Nathan Mattes 2023-09-27 14:40:58 +02:00
parent 65f39f4b61
commit 0e964de0df
5 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mastodon.xcodeproj/project.pbxproj
View File

@ -143,7 +143,6 @@
D8318A862A4468C700C0FB73 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A852A4468C700C0FB73 /* SettingsViewController.swift */; }; D8318A862A4468C700C0FB73 /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A852A4468C700C0FB73 /* SettingsViewController.swift */; };
D8318A882A4468D300C0FB73 /* NotificationSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A872A4468D300C0FB73 /* NotificationSettingsViewController.swift */; }; D8318A882A4468D300C0FB73 /* NotificationSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A872A4468D300C0FB73 /* NotificationSettingsViewController.swift */; };
D8318A8A2A4468DC00C0FB73 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A892A4468DC00C0FB73 /* AboutViewController.swift */; }; D8318A8A2A4468DC00C0FB73 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A892A4468DC00C0FB73 /* AboutViewController.swift */; };
D8318A8C2A4468E600C0FB73 /* SupportMastodonViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8318A8B2A4468E600C0FB73 /* SupportMastodonViewController.swift */; };
D8363B1629469CE200A74079 /* OnboardingNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8363B1529469CE200A74079 /* OnboardingNextView.swift */; }; D8363B1629469CE200A74079 /* OnboardingNextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8363B1529469CE200A74079 /* OnboardingNextView.swift */; };
D87BFC8B291D5C6B00FEE264 /* MastodonLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */; }; D87BFC8B291D5C6B00FEE264 /* MastodonLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */; };
D87BFC8D291EB81200FEE264 /* MastodonLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */; }; D87BFC8D291EB81200FEE264 /* MastodonLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */; };
@ -801,7 +800,6 @@
D8318A852A4468C700C0FB73 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; }; D8318A852A4468C700C0FB73 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
D8318A872A4468D300C0FB73 /* NotificationSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsViewController.swift; sourceTree = "<group>"; }; D8318A872A4468D300C0FB73 /* NotificationSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSettingsViewController.swift; sourceTree = "<group>"; };
D8318A892A4468DC00C0FB73 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; }; D8318A892A4468DC00C0FB73 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
D8318A8B2A4468E600C0FB73 /* SupportMastodonViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportMastodonViewController.swift; sourceTree = "<group>"; };
D8363B1529469CE200A74079 /* OnboardingNextView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = OnboardingNextView.swift; sourceTree = "<group>"; tabWidth = 4; }; D8363B1529469CE200A74079 /* OnboardingNextView.swift */ = {isa = PBXFileReference; indentWidth = 4; lastKnownFileType = sourcecode.swift; path = OnboardingNextView.swift; sourceTree = "<group>"; tabWidth = 4; };
D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginView.swift; sourceTree = "<group>"; }; D87BFC8A291D5C6B00FEE264 /* MastodonLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginView.swift; sourceTree = "<group>"; };
D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginViewModel.swift; sourceTree = "<group>"; }; D87BFC8C291EB81200FEE264 /* MastodonLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonLoginViewModel.swift; sourceTree = "<group>"; };
@ -1772,7 +1770,6 @@
D8F917092A4B2AFF008A5370 /* About Mastodon */, D8F917092A4B2AFF008A5370 /* About Mastodon */,
D8318A7E2A4466C900C0FB73 /* Legacy */, D8318A7E2A4466C900C0FB73 /* Legacy */,
D8318A7F2A4466D300C0FB73 /* SettingsCoordinator.swift */, D8318A7F2A4466D300C0FB73 /* SettingsCoordinator.swift */,
D8318A8B2A4468E600C0FB73 /* SupportMastodonViewController.swift */,
); );
path = Settings; path = Settings;
sourceTree = "<group>"; sourceTree = "<group>";
@ -3666,7 +3663,6 @@
2D5A3D3825CF8D9F002347D6 /* ScrollViewContainer.swift in Sources */, 2D5A3D3825CF8D9F002347D6 /* ScrollViewContainer.swift in Sources */,
DB6180EF26391CA50018D199 /* MediaPreviewImageViewController.swift in Sources */, DB6180EF26391CA50018D199 /* MediaPreviewImageViewController.swift in Sources */,
DB1E347825F519300079D7DF /* PickServerItem.swift in Sources */, DB1E347825F519300079D7DF /* PickServerItem.swift in Sources */,
D8318A8C2A4468E600C0FB73 /* SupportMastodonViewController.swift in Sources */,
DB336F3F278E668C0031E64B /* StatusTableViewCell+ViewModel.swift in Sources */, DB336F3F278E668C0031E64B /* StatusTableViewCell+ViewModel.swift in Sources */,
DB63F764279A5E3C00455B82 /* NotificationTimelineViewController.swift in Sources */, DB63F764279A5E3C00455B82 /* NotificationTimelineViewController.swift in Sources */,
855149C8295F1C5F00943D96 /* UIInterfaceOrientationMask.swift in Sources */, 855149C8295F1C5F00943D96 /* UIInterfaceOrientationMask.swift in Sources */,

11
Mastodon/Scene/Settings/Settings Overview/Settings.swift
View File

@ -11,7 +11,6 @@ enum SettingsEntry: Hashable {
case general case general
case notifications case notifications
case aboutMastodon case aboutMastodon
case supportMastodon
case logout(accountName: String) case logout(accountName: String)
var title: String { var title: String {
@ -22,8 +21,6 @@ enum SettingsEntry: Hashable {
return L10n.Scene.Settings.Overview.notifications return L10n.Scene.Settings.Overview.notifications
case .aboutMastodon: case .aboutMastodon:
return L10n.Scene.Settings.Overview.aboutMastodon return L10n.Scene.Settings.Overview.aboutMastodon
case .supportMastodon:
return L10n.Scene.Settings.Overview.supportMastodon
case .logout(let accountName): case .logout(let accountName):
return L10n.Scene.Settings.Overview.logout(accountName) return L10n.Scene.Settings.Overview.logout(accountName)
} }
@ -33,8 +30,6 @@ enum SettingsEntry: Hashable {
switch self { switch self {
case .general, .notifications, .aboutMastodon, .logout(_): case .general, .notifications, .aboutMastodon, .logout(_):
return .disclosureIndicator return .disclosureIndicator
case .supportMastodon:
return .none
} }
} }
@ -46,8 +41,6 @@ enum SettingsEntry: Hashable {
return UIImage(systemName: "bell.badge") return UIImage(systemName: "bell.badge")
case .aboutMastodon: case .aboutMastodon:
return UIImage(systemName: "info.circle.fill") return UIImage(systemName: "info.circle.fill")
case .supportMastodon:
return UIImage(systemName: "heart.fill")
case .logout(_): case .logout(_):
return nil return nil
} }
@ -61,8 +54,6 @@ enum SettingsEntry: Hashable {
return .systemRed return .systemRed
case .aboutMastodon: case .aboutMastodon:
return .systemPurple return .systemPurple
case .supportMastodon:
return .systemGreen
case .logout(_): case .logout(_):
return nil return nil
} }
@ -71,7 +62,7 @@ enum SettingsEntry: Hashable {
var textColor: UIColor { var textColor: UIColor {
switch self { switch self {
case .general, .notifications, .aboutMastodon, .supportMastodon: case .general, .notifications, .aboutMastodon:
return .label return .label
case .logout(_): case .logout(_):
return .red return .red

2
Mastodon/Scene/Settings/Settings Overview/SettingsViewController.swift
View File

@ -20,7 +20,7 @@ class SettingsViewController: UIViewController {
sections = [ sections = [
.init(entries: [.general, .notifications]), .init(entries: [.general, .notifications]),
.init(entries: [.supportMastodon, .aboutMastodon]), .init(entries: [.aboutMastodon]),
.init(entries: [.logout(accountName: accountName)]) .init(entries: [.logout(accountName: accountName)])
] ]

3
Mastodon/Scene/Settings/SettingsCoordinator.swift
View File

@ -72,9 +72,6 @@ extension SettingsCoordinator: SettingsViewControllerDelegate {
aboutViewController.delegate = self aboutViewController.delegate = self
navigationController.pushViewController(aboutViewController, animated: true) navigationController.pushViewController(aboutViewController, animated: true)
case .supportMastodon:
break
// present support-screen
case .logout(_): case .logout(_):
delegate?.logout(self) delegate?.logout(self)
} }

3
Mastodon/Scene/Settings/SupportMastodonViewController.swift
View File

@ -1,3 +0,0 @@
// Copyright © 2023 Mastodon gGmbH. All rights reserved.
import Foundation