Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: xcode16 build #2429

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
5 changes: 0 additions & 5 deletions ios/PolkadotVault/Cards/TransactionCardSelector.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ struct TransactionCardSelector: View {
TCAuthorPlain(value: value)
case let .authorPublicKeyCard(value): // Not present on new designs
TCAuthorPublicKey(value: value)

// Foldable Markdown values on tap
case let .callCard(value): // This is used to present `Method` and provides details on tap
TCCall(value: value)
Expand All @@ -26,7 +25,6 @@ struct TransactionCardSelector: View {
TCFieldName(value: value)
case let .fieldNumberCard(value):
TCFieldNumber(value: value)

// Sections
case let .newSpecsCard(value): // User when adding new network, redesigned
TCAddNewNetwork(value: value)
Expand All @@ -39,21 +37,18 @@ struct TransactionCardSelector: View {
case let .txSpecPlainCard(value): // Unknown network information for given transaction, not present on new
// designs
TCTXSpecPlain(content: value)

// Error handling
case let .errorCard(text):
TCError(text: text)
case let .warningCard(text):
TCWarning(text: text)

// Simple values with identicons / icons / markdown
case let .networkInfoCard(value): // Not present in new designs
TCNetworkInfo(content: value)
case let .typesInfoCard(value): // Not present in new designs
TCTypesInfo(content: value)
case let .textCard(text): // Markdown text field, not present on new designs
TCText(text: text)

// Simple values - redesigned
case let .authorCard(author):
TCNamedValueCard(name: Localizable.TCName.from.string, value: author.base58, valueInSameLine: false)
Expand Down
2 changes: 1 addition & 1 deletion ios/PolkadotVault/Helpers/URLOpening.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
func open(
_ url: URL,
options: [UIApplication.OpenExternalURLOptionsKey: Any],
completionHandler completion: ((Bool) -> Void)?
completionHandler completion: (@MainActor @Sendable (Bool) -> Void)?
)
}

extension UIApplication: URLOpening {

Check failure on line 22 in ios/PolkadotVault/Helpers/URLOpening.swift

View workflow job for this annotation

GitHub Actions / Check on MacOS

type 'UIApplication' does not conform to protocol 'URLOpening'

Check failure on line 22 in ios/PolkadotVault/Helpers/URLOpening.swift

View workflow job for this annotation

GitHub Actions / Check on MacOS

type 'UIApplication' does not conform to protocol 'URLOpening'
func open(_ url: URL) {
open(url, options: [:], completionHandler: nil)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extension MTransaction {
var hasImportableKeys: Bool {
switch ttype {
case .importDerivations:
var hasImportableKeys: Bool = false
var hasImportableKeys = false
sortedValueCards().forEach {
if case let .derivationsCard(keys) = $0.card {
hasImportableKeys = keys
Expand Down
9 changes: 8 additions & 1 deletion rust/qr_reader_pc/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use indicatif::ProgressBar;
use qr_reader_phone::process_payload::{process_decoded_payload, InProgress, Ready};

use opencv::{
core::AlgorithmHint,
highgui,
imgproc::{cvt_color, COLOR_BGR2GRAY},
prelude::*,
Expand Down Expand Up @@ -123,7 +124,13 @@ fn camera_capture(camera: &mut videoio::VideoCapture, window: &str) -> Result<Gr
let mut image: GrayImage = ImageBuffer::new(DEFAULT_WIDTH, DEFAULT_HEIGHT);
let mut ocv_gray_image = Mat::default();

cvt_color(&frame, &mut ocv_gray_image, COLOR_BGR2GRAY, 0)?;
cvt_color(
&frame,
&mut ocv_gray_image,
COLOR_BGR2GRAY,
0,
AlgorithmHint::ALGO_HINT_DEFAULT,
)?;

for y in 0..ocv_gray_image.rows() {
for x in 0..ocv_gray_image.cols() {
Expand Down
Loading