add min lrc fee tip in setting

LoopringSecondary · Oct 1, 2018 · 5cc1d4f · 5cc1d4f
1 parent 963d84a
commit 5cc1d4f
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 3 deletions.
diff --git a/loopr-ios.xcodeproj/project.pbxproj b/loopr-ios.xcodeproj/project.pbxproj
@@ -3554,9 +3554,8 @@
 				PRODUCT_NAME = "UP Wallet";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OBJC_BRIDGING_HEADER = "loopr-ios/loopr-ios-Bridging-Header.h";
-				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

diff --git a/loopr-ios/Setting/SettingLRCFeeRatio/SettingLRCFeeRatioViewController.swift b/loopr-ios/Setting/SettingLRCFeeRatio/SettingLRCFeeRatioViewController.swift
@@ -14,7 +14,8 @@ class SettingLRCFeeRatioViewController: UIViewController, StepSliderDelegate {
 
     var stepSlider = StepSlider.getDefault()
     var currentValue: Double = 0
-    var currentValueLabel = UILabel()
+    var currentValueLabel = UILabel(frame: .zero)
+    var tipLabel = UILabel(frame: .zero)
 
     var isViewDidAppear: Bool = false
 
@@ -46,6 +47,15 @@ class SettingLRCFeeRatioViewController: UIViewController, StepSliderDelegate {
         stepSlider.trackCircleRadius = 0
         stepSlider.labels = [LocalizedString("Slow", comment: ""), LocalizedString("Fast", comment: "")]
         stepSlider.setPercentageValue(Float((currentValue-0.001)/0.049))
+
+        tipLabel.frame = CGRect(x: 24, y: stepSlider.frame.maxY + 50, width: screenWidth-24*2, height: 20)
+        tipLabel.font = FontConfigManager.shared.getCharactorFont(size: 11)
+        tipLabel.theme_textColor = ["#00000099", "#ffffff66"]
+
+        let title = LocalizedString("Lrc_Fee_Tip", comment: "")
+        let amount = GasDataManager.shared.getGasAmount(by: "eth_transfer", in: "LRC")
+        tipLabel.text = "\(title) \(amount.withCommas()) LRC"
+        view.addSubview(tipLabel)
 
         let saveButon = UIBarButtonItem(title: LocalizedString("Save", comment: ""), style: UIBarButtonItemStyle.plain, target: self, action: #selector(pressedSaveButton))
         saveButon.setTitleTextAttributes([NSAttributedStringKey.font: FontConfigManager.shared.getCharactorFont(size: 14)], for: .normal)

diff --git a/loopr-ios/en.lproj/Localizable.strings b/loopr-ios/en.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "Market/Price";
 "Amount/Filled" = "Amount/Filled";
 "Status/Date" = "Status/Date";
+"Lrc_Fee_Tip" = "● Min value of Loopring trading fee: ";
 
 /* Trade tips */
 "Convert_DES" = "● Think of it like the coin version of a paper note. The same value, but some machines only take coins. The conversion ratio between ETH and WETH is always 1:1, guaranteed by Ethereum.";

diff --git a/loopr-ios/ja.lproj/Localizable.strings b/loopr-ios/ja.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "Market/Price";
 "Amount/Filled" = "Amount/Filled";
 "Status/Date" = "Status/Date";
+"Lrc_Fee_Tip" = "● Min value of Loopring trading fee: ";
 
 /* Trade tips */
 "Convert_DES" = "● Think of it like the coin version of a paper note. The same value, but some machines only take coins. The conversion ratio between ETH and WETH is always 1:1, guaranteed by Ethereum.";

diff --git a/loopr-ios/ko.lproj/Localizable.strings b/loopr-ios/ko.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "Market/Price";
 "Amount/Filled" = "Amount/Filled";
 "Status/Date" = "Status/Date";
+"Lrc_Fee_Tip" = "● Min value of Loopring trading fee: ";
 
 /* Trade tips */
 "Convert_DES" = "● Think of it like the coin version of a paper note. The same value, but some machines only take coins. The conversion ratio between ETH and WETH is always 1:1, guaranteed by Ethereum.";

diff --git a/loopr-ios/ru.lproj/Localizable.strings b/loopr-ios/ru.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "Market/Price";
 "Amount/Filled" = "Amount/Filled";
 "Status/Date" = "Status/Date";
+"Lrc_Fee_Tip" = "● Min value of Loopring trading fee: ";
 
 /* Trade tips */
 "Convert_DES" = "● Think of it like the coin version of a paper note. The same value, but some machines only take coins. The conversion ratio between ETH and WETH is always 1:1, guaranteed by Ethereum.";

diff --git a/loopr-ios/zh-Hans.lproj/Localizable.strings b/loopr-ios/zh-Hans.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "市场对/单价";
 "Amount/Filled" = "数量/成交率";
 "Status/Date" = "状态/时间";
+"Lrc_Fee_Tip" = "● Loopring 协议最低交易手续费: ";
 
 /* Trade tips */
 "Convert_DES" = "● WETH之于ETH, 正如硬币之于等额的纸币。某些场合, 贩卖机只能接受硬币, 因此需要转换。以太坊协议保证: WETH和ETH之间的转换比率为 1 : 1, 且永不改变。";

diff --git a/loopr-ios/zh-Hant.lproj/Localizable.strings b/loopr-ios/zh-Hant.lproj/Localizable.strings
@@ -206,6 +206,7 @@
 "Market/Price" = "市場對/價格";
 "Amount/Filled" = "數額/成交率";
 "Status/Date" = "狀態/日期";
+"Lrc_Fee_Tip" = "● Loopring 協議最低交易手續費: ";
 
 /* Trade tips */
 "Convert_DES" = "● WETH之於ETH, 正如硬幣之於等額的紙幣。某些場合, 販賣機只能接受硬幣, 因此需要轉換。以太坊協議保證: WETH和ETH之間的轉換比率固定為 1 : 1。";