Remove AppConstants (#24294)

* Remove AppConstants.AboutScreen

* Remove AppConstants.AppRatings

* Remove shareTitle

* Replace Settings

* Remove AppConstants.Settings

* Remove AppConstants.Logout

* Replace productTwitterHandle

* Replace productTwitterURL

* Replace productBlogURL

* Replace productBlogDisplayURL

* Replace zendeskSourcePlatform

* Replace ShareAppName

* Remove mobileAnnounceAppId

* Replace authKeychainServiceName

* Remove AppConstants

* Remove `https://` from `Info.plist`s

Apparently, Xcode/`xcodebuild` fails to parse it, see how
https://buildkite.com/automattic/wordpress-ios/builds/26578/steps?jid=0195bb59-1f1a-40ad-89c9-3964c36cff28#0195bb59-1f1a-40ad-89c9-3964c36cff28/973-5502
failed and notice the build for this commit passes.

---------

Co-authored-by: Gio Lodi <[email protected]>

Author: kean

Modules/Sources/BuildSettingsKit/BuildSettings+Live.swift

@@ -14,6 +14,14 @@ extension BuildSettings {
         itunesAppID = bundle.infoValue(forKey: "WPItunesAppID")
         appURLScheme = bundle.infoValue(forKey: "WPAppURLScheme")
         jetpackAppURLScheme = bundle.infoValue(forKey: "WPJetpackAppURLScheme")
+        about = ProductAboutDetails(
+            twitterHandle: bundle.infoValue(forKey: "WPProductTwitterHandle"),
+            twitterURL: bundle.urlValue(forKey: "WPProductTwitterURL"),
+            blogURL: bundle.urlValue(forKey: "WPProductBlogURL")
+        )
+        zendeskSourcePlatform = bundle.infoValue(forKey: "WPZendeskSourcePlatform")
+        mobileAnnounceAppID = bundle.infoValue(forKey: "WPMobileAnnounceAppID")
+        authKeychainServiceName = bundle.infoValue(forKey: "WPAuthKeychainServiceName")
     }
 }
 
@@ -32,6 +40,11 @@ private extension Bundle {
             fatalError("unexpected value: \(object) for key: \(key)")
         }
     }
+
+    func urlValue(forKey key: String) -> URL {
+        let urlWithoutScheme: String = infoValue(forKey: key)
+        return URL(string: "https://\(urlWithoutScheme)")!
+    }
 }
 
 private extension Bundle {

Modules/Sources/BuildSettingsKit/BuildSettings+Preview.swift

@@ -12,7 +12,15 @@ extension BuildSettings {
         explatPlatform: "xcpreview",
         itunesAppID: "1234567890",
         appURLScheme: "xcpreview",
-        jetpackAppURLScheme: "jetpack"
+        jetpackAppURLScheme: "jetpack",
+        about: ProductAboutDetails(
+            twitterHandle: "@wordpress",
+            twitterURL: URL(string: "www.example.com")!,
+            blogURL: URL(string: "www.example.com")!
+        ),
+        zendeskSourcePlatform: "zen",
+        mobileAnnounceAppID: "1234567890",
+        authKeychainServiceName: "public-api.wordpress.com"
     )
 }
 

Modules/Sources/BuildSettingsKit/BuildSettings.swift

@@ -22,6 +22,16 @@ public struct BuildSettings: Sendable {
     public var itunesAppID: String
     public var appURLScheme: String
     public var jetpackAppURLScheme: String
+    public var about: ProductAboutDetails
+    public var zendeskSourcePlatform: String
+    public var mobileAnnounceAppID: String
+    public var authKeychainServiceName: String
+
+    public struct ProductAboutDetails: Sendable {
+        public var twitterHandle: String
+        public var twitterURL: URL
+        public var blogURL: URL
+    }
 
     public static var current: BuildSettings {
         switch BuildSettingsEnvironment.current {

WordPress/Classes/Models/WPAccount+AccountSettings.swift

@@ -1,4 +1,5 @@
 import Foundation
+import BuildSettingsKit
 
 extension WPAccount {
     enum VerificationStatus: String {
@@ -33,4 +34,8 @@ extension WPAccount {
     var needsEmailVerification: Bool {
         return verificationStatus == .unverified
     }
+
+    @objc class var authKeychainServiceName: String {
+        BuildSettings.current.authKeychainServiceName
+    }
 }

WordPress/Classes/Models/WPAccount.m

@@ -155,9 +155,4 @@ + (void)migrateAuthKeyForUsername:(NSString *)username
     });
 }
 
-+ (NSString *)authKeychainServiceName
-{
-    return [AppConstants authKeychainServiceName];
-}
-
 @end

WordPress/Classes/Services/CredentialsService.swift

@@ -1,3 +1,4 @@
+import BuildSettingsKit
 import SFHFKeychainUtils
 
 protocol CredentialsProvider {
@@ -18,6 +19,6 @@ class CredentialsService {
     }
 
     func getOAuthToken(site: JetpackSiteRef) -> String? {
-        return provider.getPassword(username: site.username, service: AppConstants.authKeychainServiceName)
+        return provider.getPassword(username: site.username, service: BuildSettings.current.authKeychainServiceName)
     }
 }

WordPress/Classes/Utility/KeychainTools.swift

@@ -43,7 +43,7 @@ final class KeychainTools: NSObject {
     static fileprivate func serviceForItem(_ item: String) -> String? {
         switch item {
         case "wordpress.com":
-            return AppConstants.authKeychainServiceName
+            return BuildSettings.current.authKeychainServiceName
         case "*", "all":
             return nil
         default:

WordPress/Classes/Utility/ZendeskUtils.swift

@@ -1118,7 +1118,7 @@ private extension ZendeskUtils {
         static let profileNameKey = "name"
         static let userDefaultsZendeskUnreadNotifications = "wp_zendesk_unread_notifications"
         static let nameFieldCharacterLimit = 50
-        static let sourcePlatform = AppConstants.zendeskSourcePlatform
+        static var sourcePlatform = BuildSettings.current.zendeskSourcePlatform
         static let gutenbergIsDefault = "mobile_gutenberg_is_default"
         static let mobileSelfHosted = "selected_site_self_hosted"
 

WordPress/Classes/ViewRelated/Me/App Settings/About/AppAboutScreenConfiguration.swift

@@ -1,7 +1,7 @@
-import Foundation
+import UIKit
 import BuildSettingsKit
 import WordPressUI
-import UIKit
+import WordPressKit
 import WordPressShared
 import AutomatticAbout
 import SwiftUI
@@ -43,13 +43,13 @@ class AppAboutScreenConfiguration: AboutScreenConfiguration {
                 }),
                 AboutItem(title: TextContent.share, action: { [weak self] context in
                     self?.tracker.buttonPressed(.share)
-                    self?.sharePresenter.present(for: AppConstants.shareAppName, in: context.viewController, source: .about, sourceView: context.sourceView)
+                    self?.sharePresenter.present(for: BuildSettings.current.shareAppName, in: context.viewController, source: .about, sourceView: context.sourceView)
                 }),
-                AboutItem(title: TextContent.twitter, subtitle: AppConstants.productTwitterHandle, cellStyle: .value1, action: { [weak self] context in
+                AboutItem(title: TextContent.twitter, subtitle: BuildSettings.current.about.twitterHandle, cellStyle: .value1, action: { [weak self] context in
                     self?.tracker.buttonPressed(.twitter)
                     self?.webViewPresenter.presentInNavigationControlller(url: Links.twitter, context: context)
                 }),
-                AboutItem(title: Strings.current.blogName, subtitle: AppConstants.productBlogDisplayURL, cellStyle: .value1, action: { [weak self] context in
+                AboutItem(title: Strings.current.blogName, subtitle: productBlogDisplayURL, cellStyle: .value1, action: { [weak self] context in
                     self?.tracker.buttonPressed(.blog)
                     self?.webViewPresenter.presentInNavigationControlller(url: Links.blog, context: context)
                 })
@@ -93,6 +93,11 @@ class AppAboutScreenConfiguration: AboutScreenConfiguration {
         self.sharePresenter = sharePresenter
     }
 
+    private var productBlogDisplayURL: String {
+        let blogURL = BuildSettings.current.about.blogURL
+        return [blogURL.host, blogURL.path].compactMap { $0 }.joined()
+    }
+
     private enum TextContent {
         static let rateUs = NSLocalizedString("Rate Us", comment: "Title for button allowing users to rate the app in the App Store")
         static let share = NSLocalizedString("Share with Friends", comment: "Title for button allowing users to share information about the app with friends, such as via Messages")
@@ -103,8 +108,8 @@ class AppAboutScreenConfiguration: AboutScreenConfiguration {
     }
 
     private enum Links {
-        static let twitter = URL(string: AppConstants.productTwitterURL)!
-        static let blog = URL(string: AppConstants.productBlogURL)!
+        static let twitter = BuildSettings.current.about.twitterURL
+        static let blog = BuildSettings.current.about.blogURL
         static let workWithUs = URL(string: Strings.current.workWithUsURL)!
         static let automattic = URL(string: "https://automattic.com")!
     }
@@ -168,6 +173,15 @@ class LegalAndMoreSubmenuConfiguration: AboutScreenConfiguration {
     }
 }
 
+extension BuildSettings {
+    var shareAppName: ShareAppName {
+        switch brand {
+        case .wordpress: .wordpress
+        case .jetpack: .jetpack
+        }
+    }
+}
+
 private struct Strings {
     var blogName: String
     var workWithUs: String

WordPress/Classes/ViewRelated/Me/Me Main/MeViewController.swift

@@ -329,7 +329,7 @@ class MeViewController: UITableViewController {
                 return
             }
 
-            self.sharePresenter.present(for: AppConstants.shareAppName, in: self, source: .me, sourceView: selectedCell)
+            self.sharePresenter.present(for: BuildSettings.current.shareAppName, in: self, source: .me, sourceView: selectedCell)
         }
     }