diff --git a/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj b/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj index fdaf61acb9..ce36d9e12a 100644 --- a/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj +++ b/UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj @@ -2134,6 +2134,8 @@ 6BB14F6C2BF49E7100E879B2 /* WalletButtonHiddenManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB14F6A2BF49E7100E879B2 /* WalletButtonHiddenManager.swift */; }; 6BB14F722BFE550600E879B2 /* MarketEtfFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB14F712BFE550600E879B2 /* MarketEtfFetcher.swift */; }; 6BB14F732BFE550600E879B2 /* MarketEtfFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB14F712BFE550600E879B2 /* MarketEtfFetcher.swift */; }; + 6BB14F752C01D04200E879B2 /* CheckBoxUiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB14F742C01D04200E879B2 /* CheckBoxUiView.swift */; }; + 6BB14F762C01D04200E879B2 /* CheckBoxUiView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BB14F742C01D04200E879B2 /* CheckBoxUiView.swift */; }; 6BBCE4A32BDA419200ABBD55 /* Web3Wallet in Frameworks */ = {isa = PBXBuildFile; productRef = 6BBCE4A22BDA419200ABBD55 /* Web3Wallet */; }; 6BBCE4A52BDA419B00ABBD55 /* Web3Wallet in Frameworks */ = {isa = PBXBuildFile; productRef = 6BBCE4A42BDA419B00ABBD55 /* Web3Wallet */; }; 6BCD53002A161F4100993F20 /* BackupCloudModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BCD52F72A161F4100993F20 /* BackupCloudModule.swift */; }; @@ -4504,6 +4506,7 @@ 6BAAF3462B9B245C00EFE5B2 /* SlideButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SlideButton.swift; sourceTree = ""; }; 6BB14F6A2BF49E7100E879B2 /* WalletButtonHiddenManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletButtonHiddenManager.swift; sourceTree = ""; }; 6BB14F712BFE550600E879B2 /* MarketEtfFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarketEtfFetcher.swift; sourceTree = ""; }; + 6BB14F742C01D04200E879B2 /* CheckBoxUiView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckBoxUiView.swift; sourceTree = ""; }; 6BCD52F72A161F4100993F20 /* BackupCloudModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BackupCloudModule.swift; sourceTree = ""; }; 6BCD52F92A161F4100993F20 /* ICloudBackupTermsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICloudBackupTermsViewModel.swift; sourceTree = ""; }; 6BCD52FA2A161F4100993F20 /* ICloudBackupTermsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ICloudBackupTermsViewController.swift; sourceTree = ""; }; @@ -5718,6 +5721,7 @@ D3DB51AE2BD7AF860091BBDB /* DiffText.swift */, D3B73E2F2BDFC5580067429D /* PriceRow.swift */, D3833B042BF4AFB800ACECFB /* MarqueeView.swift */, + 6BB14F742C01D04200E879B2 /* CheckBoxUiView.swift */, ); path = SwiftUI; sourceTree = ""; @@ -10468,6 +10472,7 @@ 11B3518BEA8865CADA5DA684 /* LaunchScreenManager.swift in Sources */, D07157DC2A2DD968006F141F /* SendTronModule.swift in Sources */, 11B35A82532EC55909EFBAD8 /* LaunchScreen.swift in Sources */, + 6BB14F762C01D04200E879B2 /* CheckBoxUiView.swift in Sources */, 11B35B925CE6EB25DF542611 /* CoinInvestorsService.swift in Sources */, 11B3545B8A5568792A4C43D8 /* CoinTreasuriesModule.swift in Sources */, 11B357ADA154348A3C1A987B /* CoinTreasuriesViewController.swift in Sources */, @@ -12043,6 +12048,7 @@ 11B3529CFD24A94DC35B476E /* CoinAnalyticsViewModel.swift in Sources */, 2FA5DE2F0DF6317DB807B7F3 /* TweetAttachmentView.swift in Sources */, 2FA5D6224C65D97B910F3A20 /* TweetPollView.swift in Sources */, + 6BB14F752C01D04200E879B2 /* CheckBoxUiView.swift in Sources */, 2FA5D3C9CDBD7CF26508E1E9 /* ReferencedTweetView.swift in Sources */, 11B3551E5E9A6D167F7BA078 /* LaunchScreenManager.swift in Sources */, 11B35FA6F9EE876BD65E9AD6 /* LaunchScreen.swift in Sources */, @@ -14055,7 +14061,7 @@ repositoryURL = "https://github.com/horizontalsystems/ComponentKit.Swift"; requirement = { kind = exactVersion; - version = 2.0.12; + version = 2.0.13; }; }; D3C187D3290FCF7D00FE1900 /* XCRemoteSwiftPackageReference "HUD" */ = { diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@2x.png index 241715782d..8bbd646c2d 100644 Binary files a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@2x.png and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@3x.png index 1c94d77259..3855633832 100644 Binary files a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@3x.png and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radiooff_24.imageset/radioff@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@2x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@2x.png index 8ea0d62668..108883680e 100644 Binary files a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@2x.png and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@2x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@3x.png b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@3x.png index 21522d16a9..634bff80a4 100644 Binary files a/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@3x.png and b/UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/circle_radioon_24.imageset/radion@3x.png differ diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/ManageAccounts/ManageAccountsViewController.swift b/UnstoppableWallet/UnstoppableWallet/Modules/ManageAccounts/ManageAccountsViewController.swift index 491b3fcd91..d07e80287e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/ManageAccounts/ManageAccountsViewController.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/ManageAccounts/ManageAccountsViewController.swift @@ -173,7 +173,7 @@ extension ManageAccountsViewController: SectionsDataSource { CellBuilderNew.row( rootElement: .hStack([ .image24 { component in - component.imageView.image = viewItem.selected ? UIImage(named: "circle_radioon_24")?.withTintColor(.themeJacob) : UIImage(named: "circle_radiooff_24")?.withTintColor(.themeGray) + component.imageView.image = viewItem.selected ? UIImage(named: "circle_radioon_24") : UIImage(named: "circle_radiooff_24") }, .vStackCentered([ .text { component in diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/Approve/MultiSwapApproveView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/Approve/MultiSwapApproveView.swift index ba0e97486e..8eee8a02bd 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/Approve/MultiSwapApproveView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/Approve/MultiSwapApproveView.swift @@ -86,14 +86,7 @@ struct MultiSwapApproveView: View { @ViewBuilder func row(text: String, selected: Bool) -> some View { HStack(spacing: .margin16) { - Image("check_2_20") - .themeIcon(color: .themeJacob) - .opacity(selected ? 1 : 0) - .frame(width: .iconSize20, height: .iconSize20, alignment: .center) - .overlay( - RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous) - .stroke(Color.themeGray, lineWidth: .heightOneDp + .heightOnePixel) - ) + CheckBoxUiView(checked: .init(get: { selected }, set: { _ in })) Text(text).themeSubhead2(color: .themeLeah) } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Passcode/DuressMode/DuressModeSelectView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Passcode/DuressMode/DuressModeSelectView.swift index 48a22ca945..4becc7d96e 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Passcode/DuressMode/DuressModeSelectView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Passcode/DuressMode/DuressModeSelectView.swift @@ -72,15 +72,7 @@ struct DuressModeSelectView: View { Text(account.type.detailedDescription).themeSubhead2() } - ZStack { - RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous) - .stroke(Color.themeGray, lineWidth: 1.5) - .frame(width: .margin24, height: .margin24) - - if selectedAccountIds.contains(account.id) { - Image("check_2_20").themeIcon(color: .themeJacob) - } - } + CheckBoxUiView(checked: .init(get: { selectedAccountIds.contains(account.id) }, set: { _ in })) } } } diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/OutputSelector/OutputSelectorView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/OutputSelector/OutputSelectorView.swift index 648c12d9de..3f9e211da3 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/OutputSelector/OutputSelectorView.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Send/Platforms/Bitcoin/OutputSelector/OutputSelectorView.swift @@ -140,13 +140,7 @@ struct OutputSelectorView: View { viewModel.toggle(viewItem: viewItem) }) { HStack(spacing: .margin16) { - Image("check_2_20") - .themeIcon(color: .themeJacob) - .opacity(viewModel.selectedSet.contains(viewItem.id) ? 1 : 0) - .overlay( - RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous) - .stroke(Color.themeGray, lineWidth: .heightOneDp + .heightOnePixel) - ) + CheckBoxUiView(checked: .init(get: { viewModel.selectedSet.contains(viewItem.id) }, set: { _ in })) VStack(spacing: 1) { Text(viewItem.date).themeBody() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SendNew/OutputSelectView2.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SendNew/OutputSelectView2.swift index 7b3eb7fa67..f3084329b4 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SendNew/OutputSelectView2.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SendNew/OutputSelectView2.swift @@ -71,13 +71,7 @@ struct OutputSelectorView2: View { viewModel.toggle(viewItem: viewItem) }) { HStack(spacing: .margin16) { - Image("check_2_20") - .themeIcon(color: .themeJacob) - .opacity(viewModel.selectedSet.contains(viewItem.id) ? 1 : 0) - .overlay( - RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous) - .stroke(Color.themeGray, lineWidth: .heightOneDp + .heightOnePixel) - ) + CheckBoxUiView(checked: .init(get: { viewModel.selectedSet.contains(viewItem.id) }, set: { _ in })) VStack(spacing: 1) { Text(viewItem.date).themeBody() diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardCell.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardCell.swift index 18c17dc9a3..af501ace44 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardCell.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/CoinCard/SwapCoinCardCell.swift @@ -96,7 +96,7 @@ class SwapCoinCardCell: UITableViewCell { maker.height.equalTo(formAmountInput.viewHeight) } - amountInputWrapper.layer.cornerRadius = .cornerRadius8 + amountInputWrapper.layer.cornerRadius = AmountInputCell.cornerRadius amountInputWrapper.layer.cornerCurve = .continuous amountInputWrapper.layer.borderWidth = .heightOnePixel amountInputWrapper.layer.borderColor = UIColor.themeSteel20.cgColor diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/SwitchAccount/SwitchAccountViewController.swift b/UnstoppableWallet/UnstoppableWallet/Modules/SwitchAccount/SwitchAccountViewController.swift index 5c9c538aef..7a37e104ea 100644 --- a/UnstoppableWallet/UnstoppableWallet/Modules/SwitchAccount/SwitchAccountViewController.swift +++ b/UnstoppableWallet/UnstoppableWallet/Modules/SwitchAccount/SwitchAccountViewController.swift @@ -58,7 +58,7 @@ extension SwitchAccountViewController: SectionsDataSource { CellBuilderNew.row( rootElement: .hStack([ .image24 { component in - component.imageView.image = viewItem.selected ? UIImage(named: "circle_radioon_24")?.withTintColor(.themeJacob) : UIImage(named: "circle_radiooff_24")?.withTintColor(.themeGray) + component.imageView.image = viewItem.selected ? UIImage(named: "circle_radioon_24") : UIImage(named: "circle_radiooff_24") }, .vStackCentered([ .text { component in diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/AmountInputCell.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/AmountInputCell.swift index 1e87606335..48fe336544 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/AmountInputCell.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/AmountInputCell.swift @@ -3,12 +3,15 @@ import ThemeKit import UIKit class AmountInputCell: UITableViewCell { + static let cornerRadius: CGFloat = .cornerRadius8 + private let formValidatedView: FormValidatedView private let formAmountInputView: FormAmountInputView init(viewModel: AmountInputViewModel) { formAmountInputView = FormAmountInputView(viewModel: viewModel) formValidatedView = FormValidatedView(contentView: formAmountInputView) + formValidatedView.set(cornerRadius: AmountInputCell.cornerRadius) super.init(style: .default, reuseIdentifier: nil) diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/Views/CheckboxView.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/Views/CheckboxView.swift index 93253d2566..ff13da7517 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/Views/CheckboxView.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/Cells/Views/CheckboxView.swift @@ -26,18 +26,17 @@ class CheckboxView: UIView { maker.size.equalTo(CheckboxView.checkBoxSize) } - checkBoxView.layer.cornerRadius = .cornerRadius4 - checkBoxView.layer.cornerCurve = .continuous - checkBoxView.layer.borderColor = UIColor.themeGray.cgColor - checkBoxView.layer.borderWidth = .heightOneDp + .heightOnePixel + checkBoxView.layer.cornerRadius = .cornerRadius12 + checkBoxView.layer.backgroundColor = UIColor.themeSteel20.cgColor checkBoxView.addSubview(checkBoxImageView) checkBoxImageView.snp.makeConstraints { maker in maker.center.equalToSuperview() } - checkBoxImageView.image = UIImage(named: "check_2_20")?.withRenderingMode(.alwaysTemplate) - checkBoxImageView.tintColor = .themeJacob + checkBoxImageView.image = UIImage(named: "check_2_24")?.withRenderingMode(.alwaysTemplate) + checkBoxImageView.isHidden = true + checkBoxImageView.tintColor = .themeDark addSubview(descriptionLabel) descriptionLabel.snp.makeConstraints { maker in @@ -68,7 +67,10 @@ class CheckboxView: UIView { var checked: Bool { get { !checkBoxImageView.isHidden } - set { checkBoxImageView.isHidden = !newValue } + set { + checkBoxImageView.isHidden = !newValue + checkBoxView.layer.backgroundColor = newValue ? UIColor.themeYellowD.cgColor : UIColor.themeSteel20.cgColor + } } } diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/FormValidatedView.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/FormValidatedView.swift index 43e3af6a8a..ae872a1e79 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/FormValidatedView.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/FormValidatedView.swift @@ -19,7 +19,7 @@ class FormValidatedView: UIView { } wrapperView.backgroundColor = .themeLawrence - wrapperView.layer.cornerRadius = .cornerRadius8 + wrapperView.layer.cornerRadius = InputView.cornerRadius wrapperView.layer.cornerCurve = .continuous wrapperView.layer.borderWidth = CGFloat.heightOneDp wrapperView.layer.borderColor = UIColor.themeSteel20.cgColor @@ -37,6 +37,10 @@ class FormValidatedView: UIView { } extension FormValidatedView { + func set(cornerRadius: CGFloat) { + wrapperView.layer.cornerRadius = cornerRadius + } + func set(cautionType: CautionType?) { let borderColor: UIColor diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/InputView.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/InputView.swift index ea4dc15ec6..b5a0260e49 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/InputView.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/Components/InputView.swift @@ -3,6 +3,8 @@ import ThemeKit import UIKit class InputView: UIView { + static let cornerRadius: CGFloat = .cornerRadius12 + private let formValidatedView: FormValidatedView private let inputStackView: InputStackView diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/BadgeViewNew.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/BadgeViewNew.swift index 3481dc05bc..bab7a640da 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/BadgeViewNew.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/BadgeViewNew.swift @@ -28,9 +28,9 @@ struct BadgeViewNew: View { } } } - .padding(.horizontal, .margin4) + .padding(.horizontal, .margin6) .padding(.vertical, .margin2) - .background(RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous).fill(Color.themeJeremy)) - .clipShape(RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous)) + .background(RoundedRectangle(cornerRadius: .cornerRadius8, style: .continuous).fill(Color.themeJeremy)) + .clipShape(RoundedRectangle(cornerRadius: .cornerRadius8, style: .continuous)) } } diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckBoxUiView.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckBoxUiView.swift new file mode 100644 index 0000000000..25772903d3 --- /dev/null +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckBoxUiView.swift @@ -0,0 +1,19 @@ +import SwiftUI + +struct CheckBoxUiView: View { + private let size: CGFloat = 24 + + @Binding var checked: Bool + + var body: some View { + ZStack { + Circle() + .fill(checked ? Color.themeYellow : Color.themeSteel20) + .frame(width: size, height: size) + + Image("check_2_24") + .themeIcon(color: .themeDark) + .opacity(checked ? 1 : 0) + } + } +} diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckboxStyle.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckboxStyle.swift index 4ff8103098..8e52ecbad3 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckboxStyle.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/CheckboxStyle.swift @@ -2,21 +2,12 @@ import SwiftUI import ThemeKit struct CheckboxStyle: ToggleStyle { - private let size: CGFloat = .margin24 - .heightOneDp - func makeBody(configuration: Configuration) -> some View { Button(action: { configuration.isOn.toggle() }, label: { - Image("check_2_20") - .themeIcon(color: .themeJacob) - .opacity(configuration.isOn ? 1 : 0) - .frame(width: size, height: size, alignment: .center) + CheckBoxUiView(checked: configuration.$isOn) }) - .overlay( - RoundedRectangle(cornerRadius: .cornerRadius4, style: .continuous) - .stroke(Color.themeGray, lineWidth: .heightOneDp + .heightOnePixel) - ) configuration.label } diff --git a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/InputTextView.swift b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/InputTextView.swift index ad78ebbeb4..bd2ef62d1e 100644 --- a/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/InputTextView.swift +++ b/UnstoppableWallet/UnstoppableWallet/UserInterface/SwiftUI/InputTextView.swift @@ -82,7 +82,7 @@ struct CautionBorder: ViewModifier { let cornerRadius: CGFloat @Binding var cautionState: CautionState - init(cornerRadius: CGFloat = .cornerRadius8, cautionState: Binding) { + init(cornerRadius: CGFloat = InputView.cornerRadius, cautionState: Binding) { self.cornerRadius = cornerRadius _cautionState = cautionState } @@ -100,7 +100,7 @@ struct FieldCautionBorder: ViewModifier { let cornerRadius: CGFloat @Binding var cautionState: FieldCautionState - init(cornerRadius: CGFloat = .cornerRadius8, cautionState: Binding) { + init(cornerRadius: CGFloat = InputView.cornerRadius, cautionState: Binding) { self.cornerRadius = cornerRadius _cautionState = cautionState }