IOS-3375 Remove redundant formatters copies

anyproto · Oct 16, 2024 · 43d2ce8 · 43d2ce8
1 parent e102a36
commit 43d2ce8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 41 deletions.
diff --git a/Anytype/Sources/Helpers/Formatters/NumberFormatter+Extension.swift b/Anytype/Sources/Helpers/Formatters/NumberFormatter+Extension.swift
@@ -0,0 +1,10 @@
+import Foundation
+
+extension NumberFormatter {
+    static let `default`: NumberFormatter = {
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.groupingSeparator = ""
+        return formatter
+    }()
+}
diff --git a/Anytype/Sources/Models/Relations/RelationsBuilder.swift b/Anytype/Sources/Models/Relations/RelationsBuilder.swift
@@ -18,20 +18,9 @@ final class RelationsBuilder: RelationsBuilderProtocol {
 
     // MARK: - Private variables
 
-    private let dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .medium
-        dateFormatter.timeStyle = .none
-        dateFormatter.doesRelativeDateFormatting = true
-        return dateFormatter
-    }()
+    private let dateFormatter = DateFormatter.relationDateFormatter
 
-    private let numberFormatter: NumberFormatter = {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.groupingSeparator = ""
-        return formatter
-    }()
+    private let numberFormatter = NumberFormatter.default
 
     // MARK: - Internal functions
 

diff --git a/...tUI/RelationDetailsViews/Text/TextRelationDetailsService/TextRelationEditingService.swift b/...tUI/RelationDetailsViews/Text/TextRelationDetailsService/TextRelationEditingService.swift
@@ -10,12 +10,7 @@ final class TextRelationEditingService: TextRelationEditingServiceProtocol {
     @Injected(\.relationsService)
     private var service: any RelationsServiceProtocol
 
-    private let numberFormatter: NumberFormatter = {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.groupingSeparator = ""
-        return formatter
-    }()
+    private let numberFormatter = NumberFormatter.default
 
     // MARK: - TextRelationDetailsServiceProtocol
 

diff --git a/...yer/TextEditor/EditorPage/Views/Settings/Relations/Entities/RelationsSectionBuilder.swift b/...yer/TextEditor/EditorPage/Views/Settings/Relations/Entities/RelationsSectionBuilder.swift
@@ -5,14 +5,8 @@ import UIKit
 final class RelationsSectionBuilder {
 
     // MARK: - Private variables
-
-    private let dateFormatter: DateFormatter = {
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateStyle = .medium
-        dateFormatter.timeStyle = .none
-        dateFormatter.doesRelativeDateFormatting = true
-        return dateFormatter
-    }()
+
+    private let dateFormatter = DateFormatter.relationDateFormatter
 
     // MARK: - Internal functions
 

diff --git a/...es/PresentationLayer/TextEditor/Set/Views/Popups/Filters/List/RelationFilterBuilder.swift b/...es/PresentationLayer/TextEditor/Set/Views/Popups/Filters/List/RelationFilterBuilder.swift
@@ -14,12 +14,7 @@ final class RelationFilterBuilder {
         return dateFormatter
     }()
 
-    private let numberFormatter: NumberFormatter = {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.groupingSeparator = ""
-        return formatter
-    }()
+    private let numberFormatter = NumberFormatter.default
 
     func relation(
         detailsStorage: ObjectDetailsStorage,

diff --git a/.../PresentationLayer/TextEditor/Set/Views/Popups/Filters/Text/SetFiltersTextViewModel.swift b/.../PresentationLayer/TextEditor/Set/Views/Popups/Filters/Text/SetFiltersTextViewModel.swift
@@ -9,13 +9,6 @@ final class SetFiltersTextViewModel: ObservableObject {
 
     private var keyboardListenerHelper: KeyboardEventsListnerHelper?
 
-    private static let numberFormatter: NumberFormatter = {
-        let formatter = NumberFormatter()
-        formatter.numberStyle = .decimal
-        formatter.groupingSeparator = ""
-        return formatter
-    }()
-
     init(filter: SetFilter, onApplyText: @escaping (String) -> Void) {
         self.input = Self.initialValue(from: filter)
         self.keyboardType = Self.keybordType(for: filter)
@@ -40,7 +33,7 @@ final class SetFiltersTextViewModel: ObservableObject {
         switch filter.conditionType {
         case .number:
             if let doubleValue = filter.filter.value.safeDoubleValue {
-                return numberFormatter.string(from: NSNumber(floatLiteral: doubleValue)) ?? ""
+                return NumberFormatter.default.string(from: NSNumber(floatLiteral: doubleValue)) ?? ""
             } else {
                 return ""
             }