Merge pull request #4984 from wikimedia/T374163-remove-duplicates

Remove unnecessary components

Wikipedia/Code/AccountViewController.swift

@@ -15,6 +15,7 @@ private enum ItemType {
  case talkPageAutoSignDiscussions
  case watchlist
  case vanishAccount
+ case informational
 }
 
 private struct Section {
@@ -46,13 +47,12 @@ class AccountViewController: SubSettingsViewController {
  return []
  }
 
- let logout = Item(title: username, subtitle: CommonStrings.logoutTitle, iconName: "settings-user", iconColor: .white, iconBackgroundColor: WMFColor.orange600, type: .logout)
- let talkPage = Item(title: WMFLocalizedString("account-talk-page-title", value: "Your talk page", comment: "Title for button and page letting user view their account page."), subtitle: nil, iconName: "settings-talk-page", iconColor: .white, iconBackgroundColor: WMFColor.blue600 , type: .talkPage)
- let watchlist = Item(title: CommonStrings.watchlist, subtitle: nil, iconName: "watchlist", iconColor: .white, iconBackgroundColor: WMFColor.yellow600, type: .watchlist)
+ let userName = Item(title: username, subtitle: nil, iconName: "settings-user", iconColor: .white, iconBackgroundColor: WMFColor.orange600, type: .informational)
+
  let vanishAccount = Item(title: CommonStrings.vanishAccount, subtitle: nil, iconName: "vanish-account", iconColor: .white, iconBackgroundColor: .red, type: .vanishAccount)
 
  let sectionItems: [Item]
- sectionItems = [logout, talkPage, watchlist, vanishAccount]
+ sectionItems = [userName, vanishAccount]
 
  let account = Section(items: sectionItems, headerTitle: WMFLocalizedString("account-group-title", value: "Your Account", comment: "Title for account group on account settings screen."), footerTitle: nil)
 
@@ -113,6 +113,12 @@ class AccountViewController: SubSettingsViewController {
  case .vanishAccount:
  cell.disclosureType = .viewController
  cell.accessibilityTraits = .button
+ case .informational:
+ cell.accessibilityTraits = .staticText
+ cell.disclosureType = .none
+ cell.isUserInteractionEnabled = false
+ cell.selectionStyle = .none
+ cell.accessoryType = .none
  }
 
  cell.apply(theme)

Wikipedia/Code/WMFSettingsViewController.m

@@ -544,8 +544,7 @@ - (void)loadSections {
 #pragma mark - Section structure
 
 - (WMFSettingsTableViewSection *)section_1 {
- NSArray *items = @[[WMFSettingsMenuItem itemForType:WMFSettingsMenuItemType_LoginAccount],
- [WMFSettingsMenuItem itemForType:WMFSettingsMenuItemType_Support]];
+ NSArray *items = @[[WMFSettingsMenuItem itemForType:WMFSettingsMenuItemType_LoginAccount]];
  WMFSettingsTableViewSection *section = [[WMFSettingsTableViewSection alloc] initWithItems:items
  headerTitle:nil
  footerText:nil];

Wikipedia/Localizations/en.lproj/Localizable.strings

@@ -69,7 +69,6 @@
 "account-creation-title" = "Create a new account";
 "account-group-title" = "Your Account";
 "account-request-vanishing" = "Vanish account";
-"account-talk-page-title" = "Your talk page";
 "account-talk-preferences-auto-sign-discussions" = "Auto-sign discussions";
 "account-talk-preferences-auto-sign-discussions-setting-explanation" = "Auto-signing of discussions will use the signature defined in Signature settings";
 "account-talk-preferences-title" = "Talk page preferences";

Wikipedia/Localizations/qqq.lproj/Localizable.strings

@@ -69,7 +69,6 @@
 "account-creation-title" = "Title for account creation interface";
 "account-group-title" = "Title for account group on account settings screen.";
 "account-request-vanishing" = "This will initiate the process of requesting your account to be vanished";
-"account-talk-page-title" = "Title for button and page letting user view their account page.";
 "account-talk-preferences-auto-sign-discussions" = "Title for talk page preference that configures adding signature to new posts";
 "account-talk-preferences-auto-sign-discussions-setting-explanation" = "Text explaining how setting the auto-signing of talk page discussions preference works";
 "account-talk-preferences-title" = "Title for talk page preference sections in account settings";