Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iOS-3375 Remove redundant formatters copies #2234

Merged
merged 2 commits into from
Oct 17, 2024
+17 −41
Merged

iOS-3375 Remove redundant formatters copies #2234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d2ce8
IOS-3375 Remove redundant formatters copies
joe-pusya Oct 16, 2024
ca24b4e
IOS-3375 Rename
joe-pusya Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Anytype/Sources/Helpers/Formatters/NumberFormatter+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import Foundation

extension NumberFormatter {
static let decimalWithNoSeparator: NumberFormatter = {
let formatter = NumberFormatter()
formatter.numberStyle = .decimal
formatter.groupingSeparator = ""
return formatter
}()
}
15 changes: 2 additions & 13 deletions Anytype/Sources/Models/Relations/RelationsBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.decimalWithNoSeparator

// MARK: - Internal functions

Expand Down
7 changes: 1 addition & 6 deletions ...tUI/RelationDetailsViews/Text/TextRelationDetailsService/TextRelationEditingService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.decimalWithNoSeparator

// MARK: - TextRelationDetailsServiceProtocol

Expand Down
10 changes: 2 additions & 8 deletions ...yer/TextEditor/EditorPage/Views/Settings/Relations/Entities/RelationsSectionBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 1 addition & 6 deletions ...es/PresentationLayer/TextEditor/Set/Views/Popups/Filters/List/RelationFilterBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.decimalWithNoSeparator

func relation(
detailsStorage: ObjectDetailsStorage,
Expand Down
9 changes: 1 addition & 8 deletions .../PresentationLayer/TextEditor/Set/Views/Popups/Filters/Text/SetFiltersTextViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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.decimalWithNoSeparator.string(from: NSNumber(floatLiteral: doubleValue)) ?? ""
} else {
return ""
}
Expand Down
Loading