Merge pull request #833 from mastodon/IOS-6_implement_short_status_action_counts

feat: Implement abbreviated status counts

Mastodon/Diffable/Onboarding/PickServerSection.swift

@@ -77,7 +77,7 @@ extension PickServerSection {
             let paragraphStyle = NSMutableParagraphStyle()
             paragraphStyle.lineHeightMultiple = 1.12
             let valueAttributedString = NSAttributedString(
-                string: parseUsersCount(server.totalUsers),
+                string: server.totalUsers.asAbbreviatedCountString(),
                 attributes: [
                     .paragraphStyle: paragraphStyle
                 ]
@@ -125,17 +125,6 @@ extension PickServerSection {
             }
             .store(in: &cell.disposeBag)
     }
-    
-    private static func parseUsersCount(_ usersCount: Int) -> String {
-        switch usersCount {
-        case 0..<1000:
-            return "\(usersCount)"
-        default:
-            let usersCountInThousand = Float(usersCount) / 1000.0
-            return String(format: "%.1fK", usersCountInThousand)
-        }
-    }
-    
 }
 
 extension PickServerSection {

MastodonSDK/Sources/MastodonExtension/Int.swift

@@ -0,0 +1,31 @@
+//
+//  Int.swift
+//  
+//
+//  Created by Marcus Kida on 28.12.22.
+//
+
+import Foundation
+
+public extension Int {
+    func asAbbreviatedCountString() -> String {
+        switch self {
+        case ..<1_000:
+            return String(format: "%d", locale: Locale.current, self)
+        case 1_000 ..< 999_999:
+            return String(format: "%.1fK", locale: Locale.current, Double(self) / 1_000)
+                .sanitizedAbbreviatedCountString(for: "K")
+        default:
+            return String(format: "%.1fM", locale: Locale.current, Double(self) / 1_000_000)
+                .sanitizedAbbreviatedCountString(for: "M")
+        }
+    }
+}
+
+fileprivate extension String {
+    func sanitizedAbbreviatedCountString(for value: String) -> String {
+        [".0", ",0", "٫٠"].reduce(self) { res, acc in
+            return res.replacingOccurrences(of: "\(acc)\(value)", with: value)
+        }
+    }
+}

MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift

@@ -9,6 +9,7 @@ import os.log
 import UIKit
 import MastodonAsset
 import MastodonLocalization
+import MastodonExtension
 
 public protocol ActionToolbarContainerDelegate: AnyObject {
     func actionToolbarContainer(_ actionToolbarContainer: ActionToolbarContainer, buttonDidPressed button: UIButton, action: ActionToolbarContainer.Action)
@@ -283,7 +284,7 @@ extension ActionToolbarContainer {
 extension ActionToolbarContainer {
     private static func title(from number: Int?) -> String {
         guard let number = number, number > 0 else { return "" }
-        return String(number)
+        return number.asAbbreviatedCountString()
     }
 }
 

MastodonSDK/Tests/MastodonExtensionTests/IntTests.swift

@@ -0,0 +1,53 @@
+//
+//  IntTests.swift
+//  
+//
+//  Created by Marcus Kida on 28.12.22.
+//
+
+import XCTest
+@testable import MastodonSDK
+
+class IntFriendlyCountTests: XCTestCase {
+    func testFriendlyCount_for_1000() {
+        let input = 1_000
+        let expectedOutput = "1K"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+    
+    func testFriendlyCount_for_1200() {
+        let input = 1_200
+        let expectedOutput = "1.2K"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+    
+    func testFriendlyCount_for_50000() {
+        let input = 50_000
+        let expectedOutput = "50K"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+    
+    func testFriendlyCount_for_70666() {
+        let input = 70_666
+        let expectedOutput = "70.7K"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+    
+    func testFriendlyCount_for_1M() {
+        let input = 1_000_000
+        let expectedOutput = "1M"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+    
+    func testFriendlyCount_for_1dot5M() {
+        let input = 1_499_000
+        let expectedOutput = "1.5M"
+        
+        XCTAssertEqual(expectedOutput, input.asAbbreviatedCountString())
+    }
+}