signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Improve name of donation settings view controller

Browse Source 
This change should have no user impact.

`DonationViewController` is now `DonationSettingsViewController`.

I think this is a better name on its own, but it'll seem even better
after upcoming change.
This commit is contained in:
Evan Hahn 2022-10-26 11:55:11 -05:00 committed by Evan Hahn
parent d63f24c6d2
commit c8bc2cde2e
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Signal.xcodeproj/project.pbxproj
View File

@ -1265,7 +1265,7 @@
F9A042C8289C7500007D08B6 /* GroupManager+GroupUpdateInfoMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A042C7289C7500007D08B6 /* GroupManager+GroupUpdateInfoMessages.swift */; };
F9A335CA282F0BF700B5F5FA /* BadgeGiftingChooseBadgeViewControllerStateTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A335C9282F0BF700B5F5FA /* BadgeGiftingChooseBadgeViewControllerStateTest.swift */; };
F9A335CC282F0DEC00B5F5FA /* BadgeGiftingChooseRecipientViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A335CB282F0DEC00B5F5FA /* BadgeGiftingChooseRecipientViewController.swift */; };
F9A8ACC7280A175E00AFC6A7 /* DonationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A8ACC6280A175E00AFC6A7 /* DonationViewController.swift */; };
F9A8ACC7280A175E00AFC6A7 /* DonationSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9A8ACC6280A175E00AFC6A7 /* DonationSettingsViewController.swift */; };
F9AE695328F046E40012E9C9 /* OWSFingerprintTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9AE695228F046E40012E9C9 /* OWSFingerprintTest.swift */; };
F9B0DC4F28948656004E07B7 /* schema.sql in Resources */ = {isa = PBXBuildFile; fileRef = F9B0DC3C28948656004E07B7 /* schema.sql */; };
F9B0DC5028948656004E07B7 /* signal-mainnet.der in Resources */ = {isa = PBXBuildFile; fileRef = F9B0DC3E28948656004E07B7 /* signal-mainnet.der */; };
@ -3604,7 +3604,7 @@
F9A042C7289C7500007D08B6 /* GroupManager+GroupUpdateInfoMessages.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "GroupManager+GroupUpdateInfoMessages.swift"; sourceTree = "<group>"; };
F9A335C9282F0BF700B5F5FA /* BadgeGiftingChooseBadgeViewControllerStateTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeGiftingChooseBadgeViewControllerStateTest.swift; sourceTree = "<group>"; };
F9A335CB282F0DEC00B5F5FA /* BadgeGiftingChooseRecipientViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BadgeGiftingChooseRecipientViewController.swift; sourceTree = "<group>"; };
F9A8ACC6280A175E00AFC6A7 /* DonationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DonationViewController.swift; sourceTree = "<group>"; };
F9A8ACC6280A175E00AFC6A7 /* DonationSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DonationSettingsViewController.swift; sourceTree = "<group>"; };
F9AE695228F046E40012E9C9 /* OWSFingerprintTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OWSFingerprintTest.swift; sourceTree = "<group>"; };
F9B0DC3C28948656004E07B7 /* schema.sql */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = schema.sql; sourceTree = "<group>"; };
F9B0DC3E28948656004E07B7 /* signal-mainnet.der */ = {isa = PBXFileReference; lastKnownFileType = file; path = "signal-mainnet.der"; sourceTree = "<group>"; };
@ -7170,7 +7170,7 @@
F9F4DE29283FDFDA001909ED /* BadgeGiftingConfirmationViewController.swift */,
F9066F0627ECE41B008C9530 /* DonationReceiptsViewController.swift */,
F900F2DC27F25AB300431E09 /* DonationReceiptViewController.swift */,
F9A8ACC6280A175E00AFC6A7 /* DonationViewController.swift */,
F9A8ACC6280A175E00AFC6A7 /* DonationSettingsViewController.swift */,
);
path = Donations;
sourceTree = "<group>";
@ -10215,7 +10215,7 @@
F924A68228F8706200E368C8 /* DonationReadMoreSheetViewController.swift in Sources */,
F9066F0727ECE41B008C9530 /* DonationReceiptsViewController.swift in Sources */,
F900F2DD27F25AB400431E09 /* DonationReceiptViewController.swift in Sources */,
F9A8ACC7280A175E00AFC6A7 /* DonationViewController.swift in Sources */,
F9A8ACC7280A175E00AFC6A7 /* DonationSettingsViewController.swift in Sources */,
F9DD70B92811AF82000C5960 /* DonationViewsUtil.swift in Sources */,
3428577D26BD8777005A2A96 /* Emoji+Available.swift in Sources */,
3428577726BD8777005A2A96 /* Emoji+Category.swift in Sources */,

2
Signal/src/Experience Upgrades/Upgrade Views/DonationMegaphone.swift
View File

@ -26,7 +26,7 @@ class DonationMegaphone: MegaphoneView {
"DONATE_MEGAPHONE_ACTION",
comment: "Action text for donate megaphone"
)) {
let vc = OWSNavigationController(rootViewController: DonationViewController())
let vc = OWSNavigationController(rootViewController: DonationSettingsViewController())
fromViewController.present(vc, animated: true)
},
secondary: Button(title: NSLocalizedString(

7
Signal/src/ViewControllers/AppSettings/AppSettingsViewController.swift
View File

@ -88,7 +88,7 @@ class AppSettingsViewController: OWSTableViewController2 {
private var hasExpiredGiftBadge: Bool = false
private func updateHasExpiredGiftBadge() {
self.hasExpiredGiftBadge = DonationViewController.shouldShowExpiredGiftBadgeSheetWithSneakyTransaction()
self.hasExpiredGiftBadge = DonationSettingsViewController.shouldShowExpiredGiftBadgeSheetWithSneakyTransaction()
}
@objc
@ -162,7 +162,10 @@ class AppSettingsViewController: OWSTableViewController2 {
accessibilityIdentifier: UIView.accessibilityIdentifier(in: self, name: "donate")
)
}, actionBlock: { [weak self] in
self?.navigationController?.pushViewController(DonationViewController(), animated: true)
self?.navigationController?.pushViewController(
DonationSettingsViewController(),
animated: true
)
}))
contents.addSection(section1)

12
Signal/src/ViewControllers/AppSettings/Donations/DonationViewController.swift → Signal/src/ViewControllers/AppSettings/Donations/DonationSettingsViewController.swift
View File

@ -9,7 +9,7 @@ import SignalMessaging
import SignalUI
import UIKit
class DonationViewController: OWSTableViewController2 {
class DonationSettingsViewController: OWSTableViewController2 {
private enum State {
case initializing
case loading
@ -36,7 +36,7 @@ class DonationViewController: OWSTableViewController2 {
private var state: State = .initializing {
didSet {
Logger.info("[Donations] DonationViewController state changed to \(state.debugDescription)")
Logger.info("[Donations] DonationSettingsViewController state changed to \(state.debugDescription)")
updateTableContents()
}
}
@ -510,7 +510,7 @@ class DonationViewController: OWSTableViewController2 {
// MARK: - Badge Expiration Delegate
extension DonationViewController: BadgeExpirationSheetDelegate {
extension DonationSettingsViewController: BadgeExpirationSheetDelegate {
func badgeExpirationSheetActionTapped(_ action: BadgeExpirationSheetAction) {
switch action {
case .dismiss:
@ -525,7 +525,7 @@ extension DonationViewController: BadgeExpirationSheetDelegate {
// MARK: - Badge management delegate
extension DonationViewController: BadgeConfigurationDelegate {
extension DonationSettingsViewController: BadgeConfigurationDelegate {
func badgeConfiguration(_ vc: BadgeConfigurationViewController, didCompleteWithBadgeSetting setting: BadgeConfiguration) {
if !self.reachabilityManager.isReachable {
OWSActionSheets.showErrorAlert(
@ -597,7 +597,7 @@ extension DonationViewController: BadgeConfigurationDelegate {
// MARK: - Donation hero delegate
extension DonationViewController: DonationHeroViewDelegate {
extension DonationSettingsViewController: DonationHeroViewDelegate {
func present(readMoreSheet: DonationReadMoreSheetViewController) {
present(readMoreSheet, animated: true)
}
@ -605,7 +605,7 @@ extension DonationViewController: DonationHeroViewDelegate {
// MARK: - Badge can't be added
extension DonationViewController: UITextViewDelegate {
extension DonationSettingsViewController: UITextViewDelegate {
func textView(_ textView: UITextView, shouldInteractWith URL: URL, in characterRange: NSRange, interaction: UITextItemInteraction) -> Bool {
if textView == statusLabel {
let currentSubscription: Subscription?

5
Signal/src/ViewControllers/ConversationView/ConversationViewController+GiftBadges.swift
View File

@ -140,7 +140,10 @@ extension ConversationViewController: BadgeExpirationSheetDelegate {
break
case .openSubscriptionsView:
let appSettings = AppSettingsViewController.inModalNavigationController()
appSettings.viewControllers += [DonationViewController(), SubscriptionViewController()]
appSettings.viewControllers += [
DonationSettingsViewController(),
SubscriptionViewController()
]
self.presentFormSheet(appSettings, animated: true, completion: nil)
case .openBoostView:
owsFailDebug("Not supported")