Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 4f6dece

Browse files
SajjonSajjon
authored
Merge pull request #125 from OpenZesame/ui_fixes
UI fixes
2 parents 56b65a5 + c892c48 commit 4f6dece

File tree

14 files changed

+57
-38
lines changed

14 files changed

+57
-38
lines changed

‎Sources/Application/Generated/SwiftGen/L10n-Constants.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ internal enum L10n {
389389
}
390390
/// Encryption password
391391
internal static let encryptionPassword = L10n.tr("Localizable", "Scene.PrepareTransaction.Field.EncryptionPassword")
392-
/// Gas price (min %@)
393-
internal static func gasPrice(_ p1: Any) -> String {
394-
return L10n.tr("Localizable", "Scene.PrepareTransaction.Field.GasPrice", String(describing: p1))
392+
/// Gas price in 'li' (min: %@ = %@)
393+
internal static func gasPrice(_ p1: Any, _ p2: Any) -> String {
394+
return L10n.tr("Localizable", "Scene.PrepareTransaction.Field.GasPrice", String(describing: p1), String(describing: p2))
395395
}
396396
/// To address
397397
internal static let recipient = L10n.tr("Localizable", "Scene.PrepareTransaction.Field.Recipient")

‎Sources/Application/Localization/en.lproj/Localizable.strings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
"Scene.PrepareTransaction.Field.Amount" = "Amount in %@";
162162
"Scene.PrepareTransaction.Button.MaxAmount" = "Max";
163163
"Scene.PrepareTransaction.Label.GasInSmallUnits" = "Gas price is measured in %@";
164-
"Scene.PrepareTransaction.Field.GasPrice" = "Gas price (min %@)";
164+
"Scene.PrepareTransaction.Field.GasPrice" = "Gas price in 'li' (min: %@ = %@)";
165165
"Scene.PrepareTransaction.Field.EncryptionPassword" = "Encryption password";
166166
"Scene.PrepareTransaction.Button.ReviewPayment" = "Review Payment";
167167
//"Scene.PrepareTransaction.Label.TransactionId" = "Transaction Id";

‎Sources/Application/Utils/AppAppearance.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ func setupBarButtonItemAppearance() {
4444

4545
private func replaceBackBarButtonImage() {
4646
let backImage = Asset.Icons.Small.chevronLeft.image
47-
let streched = backImage.stretchableImage(withLeftCapWidth: 15, topCapHeight: 30)
48-
UIBarButtonItem.appearance().setBackButtonBackgroundImage(streched, for: .normal, barMetrics: .default)
47+
let stretched = backImage.stretchableImage(withLeftCapWidth: 15, topCapHeight: 30)
48+
UIBarButtonItem.appearance().setBackButtonBackgroundImage(stretched, for: .normal, barMetrics: .default)
4949
}
5050

5151
public extension UINavigationBar {

‎Sources/Application/Utils/NavigationBarLayoutOwner.swift‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public extension UINavigationBar {
4848

4949
public struct NavigationBarLayout: Equatable {
5050
public static func == (lhs: NavigationBarLayout, rhs: NavigationBarLayout) -> Bool {
51-
return lhs.visibility == rhs.visibility &&
51+
lhs.visibility == rhs.visibility &&
5252
lhs.isTranslucent == rhs.isTranslucent &&
5353
lhs.tintColor == rhs.tintColor &&
5454
lhs.barTintColor == rhs.barTintColor &&
@@ -88,7 +88,7 @@ public struct NavigationBarLayout: Equatable {
8888
shadowImage: UIImage? = nil,
8989
titleFont: UIFont? = nil,
9090
titleColor: UIColor? = nil
91-
) {
91+
) {
9292
self.barStyle = barStyle
9393
self.visibility = visibility
9494
self.isTranslucent = isTranslucent ?? UINavigationBar.defaultIsTranslucent
@@ -103,7 +103,11 @@ public struct NavigationBarLayout: Equatable {
103103
self.titleFont = titleFont ?? UINavigationBar.defaultFont
104104
self.titleColor = titleColor ?? UINavigationBar.defaultTextColor
105105
}
106-
public enum Visibility: Equatable {
106+
107+
}
108+
109+
public extension NavigationBarLayout {
110+
enum Visibility: Equatable {
107111
case hidden(animated: Bool)
108112
case visible(animated: Bool)
109113
var isHidden: Bool {
@@ -125,17 +129,17 @@ public extension NavigationBarLayout {
125129
static var `default`: NavigationBarLayout = .opaque
126130

127131
static var opaque: NavigationBarLayout {
128-
return NavigationBarLayout(
132+
NavigationBarLayout(
129133
isTranslucent: false
130134
)
131135
}
132136

133-
static var transluscent: NavigationBarLayout {
134-
return transluscent()
137+
static var translucent: NavigationBarLayout {
138+
translucent()
135139
}
136140

137-
static func transluscent(tintColor: UIColor? = nil, titleColor: UIColor? = nil) -> NavigationBarLayout {
138-
return NavigationBarLayout(
141+
static func translucent(tintColor: UIColor? = nil, titleColor: UIColor? = nil) -> NavigationBarLayout {
142+
NavigationBarLayout(
139143
isTranslucent: true,
140144
tintColor: tintColor,
141145
backgroundColor: .clear,
@@ -144,7 +148,7 @@ public extension NavigationBarLayout {
144148
}
145149

146150
static var hidden: NavigationBarLayout {
147-
return NavigationBarLayout(
151+
NavigationBarLayout(
148152
visibility: .hidden(animated: false)
149153
)
150154
}

‎Sources/Controller/AbstractController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import RxSwift
2929
class AbstractController: UIViewController {
3030
let rightBarButtonSubject = PublishSubject<Void>()
3131
let leftBarButtonSubject = PublishSubject<Void>()
32-
lazy var rightBarButtonAbtractTarget = AbstractTarget(triggerSubject: rightBarButtonSubject)
33-
lazy var leftBarButtonAbtractTarget = AbstractTarget(triggerSubject: leftBarButtonSubject)
32+
lazy var rightBarButtonAbstractTarget = AbstractTarget(triggerSubject: rightBarButtonSubject)
33+
lazy var leftBarButtonAbstractTarget = AbstractTarget(triggerSubject: leftBarButtonSubject)
3434
}
3535

3636
extension AbstractController {

‎Sources/Controller/AbstractViewController+BarButtonItem/AbstractController+BarButtonContent.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import UIKit
2626

2727
extension AbstractController {
2828
func setRightBarButtonUsing(content barButtonContent: BarButtonContent) {
29-
let item = barButtonContent.makeBarButtonItem(target: self.rightBarButtonAbtractTarget, selector: #selector(AbstractTarget.pressed))
29+
let item = barButtonContent.makeBarButtonItem(target: self.rightBarButtonAbstractTarget, selector: #selector(AbstractTarget.pressed))
3030
navigationItem.rightBarButtonItem = item
3131
}
3232

3333
func setLeftBarButtonUsing(content barButtonContent: BarButtonContent) {
34-
let item = barButtonContent.makeBarButtonItem(target: self.leftBarButtonAbtractTarget, selector: #selector(AbstractTarget.pressed))
34+
let item = barButtonContent.makeBarButtonItem(target: self.leftBarButtonAbstractTarget, selector: #selector(AbstractTarget.pressed))
3535
navigationItem.leftBarButtonItem = item
3636
}
3737
}

‎Sources/Controller/AbstractViewController+BarButtonItem/BarButtonContent.swift‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@
2525
import UIKit
2626

2727
struct BarButtonContent {
28-
enum ButtontType {
28+
29+
enum ButtonType {
2930
case text(String)
3031
case image(UIImage)
3132
case system(UIBarButtonItem.SystemItem)
3233
}
33-
let type: ButtontType
34+
35+
let type: ButtonType
3436
let style: UIBarButtonItem.Style?
3537

36-
init(type: ButtontType, style: UIBarButtonItem.Style? = .plain) {
38+
init(type: ButtonType, style: UIBarButtonItem.Style? = .plain) {
3739
self.type = type
3840
self.style = style
3941
}

‎Sources/Scenes/1_Main/2_Main/0_Main/Main.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ extension Main: RightBarButtonContentMaking {
3232

3333
extension Main: NavigationBarLayoutOwner {
3434
var navigationBarLayout: NavigationBarLayout {
35-
return .transluscent
35+
return .translucent
3636
}
3737
}

‎Sources/Scenes/1_Main/2_Main/A_Send/1_PrepareTransaction/0_PrepareTransaction/PrepareTransactionViewModel.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,13 @@ final class PrepareTransactionViewModel: BaseViewModel<
215215

216216
let isReviewButtonEnabled = payment.map { $0 != nil }
217217

218-
let gasPricePlaceholder = Driver.just(GasPrice.min).map { €.Field.gasPrice(formatter.format(amount: $0, in: .li, formatThousands: true, showUnit: true)) }
218+
let gasPricePlaceholder = Driver.just(GasPrice.min).map {
219+
€.Field.gasPrice(
220+
formatter.format(amount: $0, in: .li, formatThousands: true, showUnit: false),
221+
formatter.format(amount: $0, in: .zil, formatThousands: true, showUnit: true)
222+
)
223+
224+
}
219225

220226
let gasPriceFormatted = gasPrice.filterNil().map { formatter.format(amount: $0, in: .li, formatThousands: true) }
221227

‎Sources/Scenes/1_Main/2_Main/A_Send/1_PrepareTransaction/1_ScanQR/ScanQRCodeViewModel.swift‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,14 @@ final class ScanQRCodeViewModel: BaseViewModel<
5151
}
5252

5353
let transactionIntentResult: Driver<ScannedQRResult> = input.fromView.scannedQrCodeString.map {
54-
guard let stringFromQR = $0 else {
54+
guard var stringFromQR = $0 else {
5555
return ScannedQRResult.failure(TransactionIntent.Error.scannedStringNotAddressNorJson)
5656
}
57+
58+
let zilliqaPrefix = "zilliqa://"
59+
if stringFromQR.starts(with: zilliqaPrefix) {
60+
stringFromQR = String(stringFromQR.dropFirst(zilliqaPrefix.count))
61+
}
5762

5863
do {
5964
return ScannedQRResult.success(try TransactionIntent.fromScannedQrCodeString(stringFromQR))

0 commit comments

Comments
 (0)