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

Add OWSPercentFormatStyle

Browse Source
This commit is contained in:
Sasha Weiss 2026-02-12 10:05:03 -08:00 committed by GitHub
parent 9ce0c01ac3
commit fe832fc0b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Signal.xcodeproj/project.pbxproj
View File

@ -2763,6 +2763,7 @@
D9708B5C29E4CCCB004306FA /* OWSDeviceManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9708B5B29E4CCCB004306FA /* OWSDeviceManagerTest.swift */; };
D972E2FF2C542BCD001D7337 /* Backup.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = D972E2FE2C542BCD001D7337 /* Backup.pb.swift */; };
D97411BB28D277C900BB1865 /* GroupManager+GenericGroupUpdates.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97411BA28D277C900BB1865 /* GroupManager+GenericGroupUpdates.swift */; };
D977D2042F3DB151005FEFD8 /* OWSPercentFormatStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D977D2032F3DB151005FEFD8 /* OWSPercentFormatStyle.swift */; };
D9791BB92EAA84830016AA5A /* SheetDisplayableError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9791BB82EAA847E0016AA5A /* SheetDisplayableError.swift */; };
D9791BC42EAADF010016AA5A /* HTTPResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D9791BC32EAADEFD0016AA5A /* HTTPResponse.swift */; };
D97992A12D9E55F20080A4F5 /* CurrencyFormatterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = D97992A02D9E55E10080A4F5 /* CurrencyFormatterTest.swift */; };
@ -6935,6 +6936,7 @@
D9708B5B29E4CCCB004306FA /* OWSDeviceManagerTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OWSDeviceManagerTest.swift; sourceTree = "<group>"; };
D972E2FE2C542BCD001D7337 /* Backup.pb.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Backup.pb.swift; sourceTree = "<group>"; };
D97411BA28D277C900BB1865 /* GroupManager+GenericGroupUpdates.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GroupManager+GenericGroupUpdates.swift"; sourceTree = "<group>"; };
D977D2032F3DB151005FEFD8 /* OWSPercentFormatStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OWSPercentFormatStyle.swift; sourceTree = "<group>"; };
D9791BB82EAA847E0016AA5A /* SheetDisplayableError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SheetDisplayableError.swift; sourceTree = "<group>"; };
D9791BC32EAADEFD0016AA5A /* HTTPResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HTTPResponse.swift; sourceTree = "<group>"; };
D97992A02D9E55E10080A4F5 /* CurrencyFormatterTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrencyFormatterTest.swift; sourceTree = "<group>"; };
@ -8792,6 +8794,7 @@
76E08F3C2AE8761D00032BC9 /* ContactSharing */,
34A95521271B510400B05242 /* ConversationView */,
34330A581E7875FB00DF2FB9 /* Fonts */,
D977D2022F3DB119005FEFD8 /* FormatStyles */,
34A95551271B510400B05242 /* ImageEditor */,
34A95514271B510400B05242 /* LinkPreview */,
D9392DDE2D88AA4900728C01 /* Media */,
@ -11608,8 +11611,6 @@
05104E392C8B540C00F8851F /* AccessibleLayoutMetric.swift */,
05104D172C8A151100F8851F /* AsyncViewTask.swift */,
05594CCF2C98A00200CCBFF6 /* HostingController.swift */,
D9B2E1172E748DFB00A823E4 /* OWSByteCountFormatStyle.swift */,
D9C5634D2EB438300001626A /* OWSByteCountFormatStyleTest.swift */,
D9DE35002DF0B886005099D7 /* ScrollableContentPinnedFooterView.swift */,
05594CCD2C989F1900CCBFF6 /* ScrollableWhenCompact.swift */,
0510F69D2C91EB2800FA3FDE /* ScrollBounceBehaviorIfAvailable.swift */,
@ -13260,6 +13261,16 @@
path = SyncMessages;
sourceTree = "<group>";
};
D977D2022F3DB119005FEFD8 /* FormatStyles */ = {
isa = PBXGroup;
children = (
D9B2E1172E748DFB00A823E4 /* OWSByteCountFormatStyle.swift */,
D9C5634D2EB438300001626A /* OWSByteCountFormatStyleTest.swift */,
D977D2032F3DB151005FEFD8 /* OWSPercentFormatStyle.swift */,
);
path = FormatStyles;
sourceTree = "<group>";
};
D9791BB72EAA84210016AA5A /* ActionSheets */ = {
isa = PBXGroup;
children = (
@ -17426,6 +17437,7 @@
3402AA71271D9E180084CBAE /* OWSLayerView.swift in Sources */,
3402AAB1271D9E180084CBAE /* OWSNavigationBar.swift in Sources */,
665EF86D290C385B00F490D2 /* OWSNavigationController.swift in Sources */,
D977D2042F3DB151005FEFD8 /* OWSPercentFormatStyle.swift in Sources */,
3402AA70271D9E180084CBAE /* OWSStackView.swift in Sources */,
765283AE2A00D8B4004583A9 /* OWSTableContents.swift in Sources */,
765283B22A00D8EC004583A9 /* OWSTableItem.swift in Sources */,

2
Signal/AppLaunch/LoadingViewController.swift
View File

@ -228,7 +228,7 @@ class LoadingViewController: UIViewController {
"LINK_NEW_DEVICE_SYNC_PROGRESS_PERCENT",
comment: "On a progress modal indicating the percent complete the sync process is. Embeds {{ formatted percentage }}",
),
percentComplete.formatted(.percent.precision(.fractionLength(0))),
percentComplete.formatted(.owsPercent()),
)
unitCountLabel.text = "\(unitCountCompleted.formatted(.number)) / \(unitCountToComplete.formatted(.number))"

6
Signal/Backups/BackupSettingsViewController.swift
View File

@ -2092,7 +2092,7 @@ private struct BackupExportProgressView: View {
"BACKUP_SETTINGS_BACKUP_EXPORT_PROGRESS_DESCRIPTION_PREPARING_BACKUP",
comment: "Description for a progress bar tracking the preparation of a Backup. Embeds 1:{{ the percentage completed preformatted as a percent, e.g. 10% }}.",
),
percentComplete.formatted(.percent.precision(.fractionLength(0))),
percentComplete.formatted(.owsPercent()),
),
)
@ -2390,7 +2390,7 @@ private struct BackupAttachmentDownloadProgressView: View {
),
latestDownloadUpdate.bytesDownloaded.formatted(.owsByteCount()),
latestDownloadUpdate.totalBytesToDownload.formatted(.owsByteCount()),
latestDownloadUpdate.percentageDownloaded.formatted(.percent.precision(.fractionLength(0))),
latestDownloadUpdate.percentageDownloaded.formatted(.owsPercent()),
)
case .pausedLowBattery:
OWSLocalizedString(
@ -2523,7 +2523,7 @@ private struct BackupAttachmentUploadProgressView: View {
),
bytesUploaded.formatted(.owsByteCount()),
totalBytesToUpload.formatted(.owsByteCount()),
percentageUploaded.formatted(.percent.precision(.fractionLength(0))),
percentageUploaded.formatted(.owsPercent()),
)
case .pausedLowBattery:
return OWSLocalizedString(

2
Signal/DeviceTransfer/DeviceTransferStatusViewController.swift
View File

@ -149,7 +149,7 @@ struct TransferStatusView: View {
.foregroundStyle(Color.Signal.secondaryLabel)
Spacer()
Text("\(progress.formatted(.percent.precision(.fractionLength(0))))")
Text("\(progress.formatted(.owsPercent()))")
.font(.body.monospacedDigit())
.padding(.bottom, 12)
LinearProgressView(progress: progress)

4
Signal/Provisioning/UserInterface/LinkAndSyncProvisioningProgressViewController.swift
View File

@ -215,7 +215,7 @@ struct LinkAndSyncProvisioningProgressView: View {
),
downloadProgress.downloadedByteCount.formatted(byteCountFormat),
downloadProgress.totalByteCount.formatted(byteCountFormat),
progressToShow.formatted(.percent.precision(.fractionLength(0))),
progressToShow.formatted(.owsPercent()),
)
} else if !viewModel.isFinalizing {
String(
@ -223,7 +223,7 @@ struct LinkAndSyncProvisioningProgressView: View {
"LINK_NEW_DEVICE_SYNC_PROGRESS_PERCENT",
comment: "On a progress modal indicating the percent complete the sync process is. Embeds {{ formatted percentage }}",
),
progressToShow.formatted(.percent.precision(.fractionLength(0))),
progressToShow.formatted(.owsPercent()),
)
} else {
OWSLocalizedString(

4
Signal/src/ViewControllers/AppSettings/Linked Devices/BackupProgressModal.swift
View File

@ -247,7 +247,7 @@ struct BackupProgressView: View {
),
downloadProgress.downloadedByteCount.formatted(byteCountFormat),
downloadProgress.totalByteCount.formatted(byteCountFormat),
progressToShow.formatted(.percent.precision(.fractionLength(0))),
progressToShow.formatted(.owsPercent()),
)
} else {
percentCompleteString
@ -261,7 +261,7 @@ struct BackupProgressView: View {
"LINK_NEW_DEVICE_SYNC_PROGRESS_PERCENT",
comment: "On a progress modal indicating the percent complete the sync process is. Embeds {{ formatted percentage }}",
),
progressToShow.formatted(.percent.precision(.fractionLength(0))),
progressToShow.formatted(.owsPercent()),
)
}

0
SignalUI/SwiftUIExtensions/OWSByteCountFormatStyle.swift → SignalUI/FormatStyles/OWSByteCountFormatStyle.swift
View File

0
SignalUI/SwiftUIExtensions/OWSByteCountFormatStyleTest.swift → SignalUI/FormatStyles/OWSByteCountFormatStyleTest.swift
View File

24
SignalUI/FormatStyles/OWSPercentFormatStyle.swift Normal file
View File

@ -0,0 +1,24 @@
//
// Copyright 2025 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
//
public struct OWSPercentFormatStyle: FormatStyle {
private let fractionDigits: Int
public init(fractionDigits: Int = 0) {
self.fractionDigits = fractionDigits
}
public func format(_ percent: Float) -> String {
return percent.formatted(.percent.precision(.fractionLength(fractionDigits)))
}
}
extension FormatStyle where Self == OWSPercentFormatStyle {
public static func owsPercent(
fractionDigits: Int = 0,
) -> OWSPercentFormatStyle {
return OWSPercentFormatStyle(fractionDigits: fractionDigits)
}
}