From 744eddd28b4d620497ae391ac92d382062d37c43 Mon Sep 17 00:00:00 2001 From: Navoda Sathsarani Date: Wed, 13 Nov 2024 21:17:20 +0530 Subject: [PATCH 1/3] fix:fixed build issues --- Podfile | 1 - Save/Extensions/IntExtensions.swift | 34 ++++++++------------- Save/Extensions/TimeIntervalExtension.swift | 13 ++++++++ 3 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 Save/Extensions/TimeIntervalExtension.swift diff --git a/Podfile b/Podfile index a6b2a0c8..18e1a638 100644 --- a/Podfile +++ b/Podfile @@ -19,7 +19,6 @@ def shared_pods pod 'LegacyUTType', '~> 0.1' pod 'GoogleAPIClientForREST/Drive', '~> 3.3' pod 'SnapKit' - pod 'SweeterSwift' pod 'LibProofMode', :git => 'https://gitlab.com/guardianproject/proofmode/libproofmode-ios.git', :branch => 'main' #:path => '../libproofmode-ios' diff --git a/Save/Extensions/IntExtensions.swift b/Save/Extensions/IntExtensions.swift index a9de3f6c..e49f1aed 100644 --- a/Save/Extensions/IntExtensions.swift +++ b/Save/Extensions/IntExtensions.swift @@ -4,37 +4,29 @@ // import Foundation - -import SweeterSwift +import CoreGraphics extension Int { - var day: TimeInterval { return TimeInterval.day } - var days: TimeInterval { return TimeInterval.day * Double(self) } + var day: TimeInterval { 24 * 60 * 60 } + var days: TimeInterval { Double(self) * day } - var hour: TimeInterval { return TimeInterval.hour } - var hours: TimeInterval { return TimeInterval.hour * Double(self) } + var hour: TimeInterval { 60 * 60 } + var hours: TimeInterval { Double(self) * hour } - var minute: TimeInterval { return TimeInterval.minute } - var minutes: TimeInterval { return TimeInterval.minute * Double(self) } + var minute: TimeInterval { 60 } + var minutes: TimeInterval { Double(self) * minute } - var second: TimeInterval { return 1 } - var seconds: TimeInterval { return Double(self) } + var second: TimeInterval { 1 } + var seconds: TimeInterval { Double(self) } var percent: CGFloat { - return (CGFloat(self) / 100.0).rounded(toPlaces: 2) + (CGFloat(self) / 100).rounded(toPlaces: 2) } func spelledOut() -> String { - if self == 1 { return "one" } - if self == 2 { return "two" } - if self == 3 { return "three" } - if self == 4 { return "four" } - if self == 5 { return "five" } - if self == 6 { return "six" } - if self == 7 { return "seven" } - if self == 8 { return "eight" } - if self == 9 { return "nine" } - + if self >= 1 && self <= 9 { + return NumberFormatter.localizedString(from: NSNumber(value: self), number: .spellOut) + } return String(self) } } diff --git a/Save/Extensions/TimeIntervalExtension.swift b/Save/Extensions/TimeIntervalExtension.swift new file mode 100644 index 00000000..618ede79 --- /dev/null +++ b/Save/Extensions/TimeIntervalExtension.swift @@ -0,0 +1,13 @@ +// +// TimeIntervalExtension.swift +// Save +// +// Created by navoda on 2024-11-13. +// Copyright © 2024 Open Archive. All rights reserved. +// + +import Foundation + +extension TimeInterval { + static let day: TimeInterval = 86400.0 // Number of seconds in a day +} From 241466f0ab7c994d2b79b9633a3c42e1652294a6 Mon Sep 17 00:00:00 2001 From: Navoda Sathsarani Date: Wed, 13 Nov 2024 22:03:07 +0530 Subject: [PATCH 2/3] added hard coded numbers to constant file --- Save/Constants/Constants.swift | 22 +++++++++++++++++++++ Save/Extensions/IntExtensions.swift | 12 +++++------ Save/Extensions/TimeIntervalExtension.swift | 5 ++++- Save/Main/Utils.swift | 5 ++--- 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 Save/Constants/Constants.swift diff --git a/Save/Constants/Constants.swift b/Save/Constants/Constants.swift new file mode 100644 index 00000000..a40dfeb2 --- /dev/null +++ b/Save/Constants/Constants.swift @@ -0,0 +1,22 @@ +// +// Constants.swift +// Save +// +// Created by navoda on 2024-11-13. +// Copyright © 2024 Open Archive. All rights reserved. +// + +import Foundation +struct TimeIntervalConstants { + static let secondsInDay: TimeInterval = 86400.0 // 24 * 60 * 60 + static let secondsInHour: TimeInterval = 3600.0 // 60 * 60 + static let secondsInMinute: TimeInterval = 60.0 // 60 + static let secondsInSecond: TimeInterval = 1.0 // 1 +} + +struct GeneralConstants { + static let percentBase: CGFloat = 100.0 + static let numberNine: Int = 9 + static let numberOne: Int = 1 + static let numberTwo:Int = 2 +} diff --git a/Save/Extensions/IntExtensions.swift b/Save/Extensions/IntExtensions.swift index e49f1aed..ee5da8a3 100644 --- a/Save/Extensions/IntExtensions.swift +++ b/Save/Extensions/IntExtensions.swift @@ -7,24 +7,24 @@ import Foundation import CoreGraphics extension Int { - var day: TimeInterval { 24 * 60 * 60 } + var day: TimeInterval { TimeIntervalConstants.secondsInDay } var days: TimeInterval { Double(self) * day } - var hour: TimeInterval { 60 * 60 } + var hour: TimeInterval { TimeIntervalConstants.secondsInHour } var hours: TimeInterval { Double(self) * hour } - var minute: TimeInterval { 60 } + var minute: TimeInterval { TimeIntervalConstants.secondsInMinute } var minutes: TimeInterval { Double(self) * minute } - var second: TimeInterval { 1 } + var second: TimeInterval { TimeIntervalConstants.secondsInSecond } var seconds: TimeInterval { Double(self) } var percent: CGFloat { - (CGFloat(self) / 100).rounded(toPlaces: 2) + (CGFloat(self) / GeneralConstants.percentBase).rounded(toPlaces:GeneralConstants.numberTwo) } func spelledOut() -> String { - if self >= 1 && self <= 9 { + if self >= GeneralConstants.numberOne && self <= GeneralConstants.numberNine { return NumberFormatter.localizedString(from: NSNumber(value: self), number: .spellOut) } return String(self) diff --git a/Save/Extensions/TimeIntervalExtension.swift b/Save/Extensions/TimeIntervalExtension.swift index 618ede79..5ef5ef2a 100644 --- a/Save/Extensions/TimeIntervalExtension.swift +++ b/Save/Extensions/TimeIntervalExtension.swift @@ -9,5 +9,8 @@ import Foundation extension TimeInterval { - static let day: TimeInterval = 86400.0 // Number of seconds in a day + + static let day: TimeInterval = TimeIntervalConstants.secondsInDay + static let hour: TimeInterval = TimeIntervalConstants.secondsInHour + static let minute: TimeInterval = TimeIntervalConstants.secondsInMinute } diff --git a/Save/Main/Utils.swift b/Save/Main/Utils.swift index 2b51c748..f93a449f 100644 --- a/Save/Main/Utils.swift +++ b/Save/Main/Utils.swift @@ -118,9 +118,8 @@ class Utils { class func destructure(interval: TimeInterval) -> (days: Int, hours: Int, minutes: Int) { let numDays = floor(interval / .day) - let numHours = floor((interval - (numDays * .day)) / 3600.0) - let numMinutes = floor(((interval - (numDays * .day)) - (numHours * 3600.0)) / 60.0) - + let numHours = floor((interval - (numDays * .day)) / .hour) + let numMinutes = floor(((interval - (numDays * .day)) - (numHours * .hour)) / .minute) return (Int(numDays), Int(numHours), Int(numMinutes)) } From 337c455ae30225069269c7ef4a486944e953b003 Mon Sep 17 00:00:00 2001 From: Navoda Sathsarani Date: Wed, 13 Nov 2024 22:16:21 +0530 Subject: [PATCH 3/3] fix: changed constant file --- Save/Constants/Constants.swift | 16 +++++++++------- Save/Extensions/IntExtensions.swift | 4 ++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Save/Constants/Constants.swift b/Save/Constants/Constants.swift index a40dfeb2..5c156051 100644 --- a/Save/Constants/Constants.swift +++ b/Save/Constants/Constants.swift @@ -8,15 +8,17 @@ import Foundation struct TimeIntervalConstants { - static let secondsInDay: TimeInterval = 86400.0 // 24 * 60 * 60 - static let secondsInHour: TimeInterval = 3600.0 // 60 * 60 - static let secondsInMinute: TimeInterval = 60.0 // 60 - static let secondsInSecond: TimeInterval = 1.0 // 1 + static let hoursInDay: Double = 24.0 + static let minutuesInHour: Double = 60.0 + static let secondsInDay: TimeInterval = hoursInDay * minutuesInHour * secondsInMinute + static let secondsInHour: TimeInterval = minutuesInHour * secondsInMinute + static let secondsInMinute: TimeInterval = 60.0 + static let secondsInSecond: TimeInterval = 1.0 } struct GeneralConstants { static let percentBase: CGFloat = 100.0 - static let numberNine: Int = 9 - static let numberOne: Int = 1 - static let numberTwo:Int = 2 + static let maxSpelledOutValue: Int = 9 + static let minSpelledOutValue: Int = 1 + static let percentRoundedTo:Int = 2 } diff --git a/Save/Extensions/IntExtensions.swift b/Save/Extensions/IntExtensions.swift index ee5da8a3..1b7d4fd0 100644 --- a/Save/Extensions/IntExtensions.swift +++ b/Save/Extensions/IntExtensions.swift @@ -20,11 +20,11 @@ extension Int { var seconds: TimeInterval { Double(self) } var percent: CGFloat { - (CGFloat(self) / GeneralConstants.percentBase).rounded(toPlaces:GeneralConstants.numberTwo) + (CGFloat(self) / GeneralConstants.percentBase).rounded(toPlaces:GeneralConstants.percentRoundedTo) } func spelledOut() -> String { - if self >= GeneralConstants.numberOne && self <= GeneralConstants.numberNine { + if self >= GeneralConstants.minSpelledOutValue && self <= GeneralConstants.maxSpelledOutValue { return NumberFormatter.localizedString(from: NSNumber(value: self), number: .spellOut) } return String(self)