- all resolved except nav bar issue (separate ticket)
This commit is contained in:
Lukas Korba
GitHub
parent
09380a169d
commit
f8191e33ac
|
|
@ -77,8 +77,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/grpc/grpc-swift.git",
|
||||
"state" : {
|
||||
"revision" : "f09cfb4d36315e2b48dbba1359179abf3cb2e6ac",
|
||||
"version" : "1.14.2"
|
||||
"revision" : "a20cac0cad4e0da457de687c45cb55aee9a45e19",
|
||||
"version" : "1.14.1"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
@ -338,8 +338,8 @@
|
|||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/zcash/ZcashLightClientKit/",
|
||||
"state" : {
|
||||
"revision" : "f600a3f066b66df7c264ac59cdf7c3421caad95c",
|
||||
"version" : "0.19.1-beta"
|
||||
"revision" : "763d3eaeee333b1c7a592d8c2810847d00a50ee1",
|
||||
"version" : "0.19.0-beta"
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -57,17 +57,6 @@ extension AddressDetailsView {
|
|||
Group {
|
||||
if let img = QRCodeGenerator.generate(from: qrText) {
|
||||
Image(img, scale: 1, label: Text(L10n.qrCodeFor(qrText)))
|
||||
.cornerRadius(20)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 20)
|
||||
.stroke(Color.white, lineWidth: 25)
|
||||
.scaleEffect(1.1)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 20)
|
||||
.stroke(Color.black, lineWidth: 8)
|
||||
.scaleEffect(1.1)
|
||||
)
|
||||
} else {
|
||||
Image(systemName: "qrcode")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,9 +21,10 @@ struct ProfileView: View {
|
|||
viewStore.send(.updateDestination(.addressDetails))
|
||||
} label: {
|
||||
Image(systemName: "info.circle")
|
||||
.offset(x: -10, y: -10)
|
||||
.padding(15)
|
||||
.tint(.black)
|
||||
}
|
||||
.offset(x: -20, y: -10)
|
||||
}
|
||||
|
||||
Text("\(viewStore.unifiedAddress)")
|
||||
|
|
@ -49,17 +50,6 @@ extension ProfileView {
|
|||
Group {
|
||||
if let img = QRCodeGenerator.generate(from: qrText) {
|
||||
Image(img, scale: 1, label: Text(L10n.qrCodeFor(qrText)))
|
||||
.cornerRadius(20)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 20)
|
||||
.stroke(Color.white, lineWidth: 25)
|
||||
.scaleEffect(1.1)
|
||||
)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 20)
|
||||
.stroke(Color.black, lineWidth: 8)
|
||||
.scaleEffect(1.1)
|
||||
)
|
||||
} else {
|
||||
Image(systemName: "qrcode")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ private extension RootView {
|
|||
viewStore.goToDestination(.home)
|
||||
}
|
||||
.activeButtonStyle
|
||||
.frame(width: 75, height: 40, alignment: .leading)
|
||||
.frame(width: 150)
|
||||
.padding()
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ extension ScanView {
|
|||
presentationMode.wrappedValue.dismiss()
|
||||
}, label: {
|
||||
Image(systemName: "arrow.backward")
|
||||
.foregroundColor(Asset.Colors.QRScan.frame.color)
|
||||
.foregroundColor(Asset.Colors.Mfp.background.color)
|
||||
.font(.system(size: 30.0))
|
||||
})
|
||||
.padding(.top, 10)
|
||||
|
|
@ -90,7 +90,7 @@ extension ScanView {
|
|||
Image(
|
||||
systemName: viewStore.isTorchOn ? "lightbulb.fill" : "lightbulb.slash"
|
||||
)
|
||||
.foregroundColor(Asset.Colors.QRScan.frame.color)
|
||||
.foregroundColor(Asset.Colors.Mfp.background.color)
|
||||
.font(.system(size: 30.0))
|
||||
}
|
||||
)
|
||||
|
|
@ -104,8 +104,8 @@ extension ScanView {
|
|||
}
|
||||
|
||||
func frameOfInterest(_ size: CGSize) -> some View {
|
||||
RoundedRectangle(cornerSize: CGSize(width: 5.0, height: 5.0))
|
||||
.stroke(Asset.Colors.QRScan.frame.color, lineWidth: 5.0)
|
||||
Rectangle()
|
||||
.stroke(Asset.Colors.Mfp.background.color, lineWidth: 5.0)
|
||||
.frame(
|
||||
width: frameSize(size),
|
||||
height: frameSize(size),
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ struct SendFlowView: View {
|
|||
}
|
||||
}
|
||||
)
|
||||
.applyScreenBackground()
|
||||
.navigationLinkEmpty(
|
||||
isActive: viewStore.bindingForInProgress,
|
||||
destination: { TransactionSendingView(viewStore: viewStore) }
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ struct CreateTransaction: View {
|
|||
|
||||
var body: some View {
|
||||
UITextView.appearance().backgroundColor = .clear
|
||||
|
||||
|
||||
return WithViewStore(store) { viewStore in
|
||||
VStack(spacing: 5) {
|
||||
VStack(spacing: 0) {
|
||||
|
|
@ -63,11 +63,7 @@ struct CreateTransaction: View {
|
|||
}
|
||||
.navigationTitle(L10n.Send.title)
|
||||
.navigationBarTitleDisplayMode(.inline)
|
||||
.padding()
|
||||
.applyScreenBackground()
|
||||
.onTapGesture {
|
||||
UIApplication.shared.endEditing()
|
||||
}
|
||||
.padding(.horizontal)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ struct MultilineTextEditorModifier: ViewModifier {
|
|||
func body(content: Content) -> some View {
|
||||
content
|
||||
.foregroundColor(Asset.Colors.Mfp.fontDark.color)
|
||||
.padding()
|
||||
.overlay(
|
||||
Rectangle()
|
||||
.stroke(outlineColor, lineWidth: 2)
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ struct SingleLineTextField<TitleAccessoryContent, InputPrefixContent, InputAcces
|
|||
placeholder: placeholderText,
|
||||
store: store
|
||||
)
|
||||
.padding(10)
|
||||
.padding(2)
|
||||
|
||||
Spacer()
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue