diff --git a/CurrencyConverter Extension/Base.lproj/SafariExtensionViewController.xib b/CurrencyConverter Extension/Base.lproj/SafariExtensionViewController.xib index a03c8e7..d97dd1b 100644 --- a/CurrencyConverter Extension/Base.lproj/SafariExtensionViewController.xib +++ b/CurrencyConverter Extension/Base.lproj/SafariExtensionViewController.xib @@ -1,13 +1,14 @@ - + - + + @@ -21,17 +22,17 @@ - + - + - + - + @@ -39,13 +40,13 @@ - + - + @@ -59,7 +60,7 @@ - + @@ -67,13 +68,13 @@ - + - + @@ -86,8 +87,23 @@ + + + + + + + + + + + + + + + - + @@ -98,6 +114,8 @@ + + @@ -105,6 +123,7 @@ + @@ -112,10 +131,11 @@ + - + @@ -184,10 +204,10 @@ - + - + @@ -195,13 +215,13 @@ - + - + @@ -246,7 +266,7 @@ - + diff --git a/CurrencyConverter Extension/ConvertPasteboardFormatter.swift b/CurrencyConverter Extension/ConvertPasteboardFormatter.swift index e7c4e9a..e50a230 100644 --- a/CurrencyConverter Extension/ConvertPasteboardFormatter.swift +++ b/CurrencyConverter Extension/ConvertPasteboardFormatter.swift @@ -19,7 +19,7 @@ class ConvertPasteboardFormatter { let ToSymbolPH = "${to_symbol}" let FromSymbolPH = "${from_symbol}" - static let formatterString : [String] = [ + static let defaultFormattingString : [String] = [ "${to_amount} ${to_symbol}", "${to_amount}", "${from_amount} ${from_symbol} => ${to_amount} ${to_symbol}", @@ -34,7 +34,7 @@ class ConvertPasteboardFormatter { } func getFormattedString(formatIndex: Int) -> String{ - var ret = ConvertPasteboardFormatter.formatterString[formatIndex] + var ret = ConvertPasteboardFormatter.defaultFormattingString[formatIndex] ret = ret.replacingOccurrences(of: FromSymbolPH, with: self.fromSymbol) ret = ret.replacingOccurrences(of: ToSymbolPH, with: self.toSymbol) @@ -47,7 +47,7 @@ class ConvertPasteboardFormatter { func getAllFormattedStrings() -> [String] { var ret : [String] = [] - for x in 0...(ConvertPasteboardFormatter.formatterString.count - 1) { + for x in 0...(ConvertPasteboardFormatter.defaultFormattingString.count - 1) { ret.insert(getFormattedString(formatIndex: x), at: x) } return ret diff --git a/CurrencyConverter Extension/SafariExtensionViewController.swift b/CurrencyConverter Extension/SafariExtensionViewController.swift index 0064bbd..06e9f52 100644 --- a/CurrencyConverter Extension/SafariExtensionViewController.swift +++ b/CurrencyConverter Extension/SafariExtensionViewController.swift @@ -35,6 +35,7 @@ class SafariExtensionViewController: SFSafariExtensionViewController { @IBOutlet weak var fxRateBtn0: NSButton! @IBOutlet weak var fxRateBtn15: NSButton! @IBOutlet weak var fxRateBtn2: NSButton! + @IBOutlet weak var baseRateValueField: NSTextField! var fxRateBtnList : [NSButton] = [] @@ -56,10 +57,17 @@ class SafariExtensionViewController: SFSafariExtensionViewController { self.convertToSym = UserDefaults.standard.value(forKey: "convertToSym") as! String? ?? "TWD" self.convertListBtn.selectItem(at: self.symbols!.firstIndex(of: self.convertFromSym ?? "USD") ?? 0) self.convertToListBtn.selectItem(at: self.symbols!.firstIndex(of: self.convertToSym ?? "TWD") ?? 0) + self.baseRateValueField.floatValue = UserDefaults.standard.value(forKey: "baseRateValue") as! Float32? ?? 1.0 self.UpdateFormatters() self.UpdateRates() } } + + @IBAction func OnBaseRateValueChanged(_ sender: NSTextField) { + let baseRateValue = sender.floatValue + UserDefaults.standard.set(baseRateValue as Float32, forKey: "baseRateValue") + UpdateRates() + } @IBAction func OnConvertFromClicked(_ sender: NSPopUpButton) { let selected = symbols![sender.indexOfSelectedItem] @@ -91,9 +99,9 @@ class SafariExtensionViewController: SFSafariExtensionViewController { func UpdateRates() { let cc = CurrencyConverter.shared - cc.convert(from: convertFromSym!, to: convertToSym!, unit: 1.0) { (result, error) in + cc.convert(from: convertFromSym!, to: convertToSym!, unit: baseRateValueField.floatValue) { (result, error) in let resultFixed = String(format: "%.4f", result) - self.ratesText.stringValue = "1:\(resultFixed)" + self.ratesText.stringValue = ":\(resultFixed)" } } diff --git a/CurrencyConverter.xcodeproj/project.pbxproj b/CurrencyConverter.xcodeproj/project.pbxproj index 555f0b4..02208e3 100644 --- a/CurrencyConverter.xcodeproj/project.pbxproj +++ b/CurrencyConverter.xcodeproj/project.pbxproj @@ -638,6 +638,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = CurrencyConverter/CurrencyConverter.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = J9849FB53X; @@ -661,6 +662,7 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = CurrencyConverter/CurrencyConverter.entitlements; + CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; DEVELOPMENT_TEAM = J9849FB53X; diff --git a/CurrencyConverter/Info.plist b/CurrencyConverter/Info.plist index 5ef49f3..4f9acc8 100644 --- a/CurrencyConverter/Info.plist +++ b/CurrencyConverter/Info.plist @@ -20,6 +20,8 @@ $(MARKETING_VERSION) CFBundleVersion 1 + LSApplicationCategoryType + public.app-category.lifestyle LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) NSAppTransportSecurity