Skip to content

Draft: [trello.com/c/avwmqc8i] Integration of SwiftUI PinPadView #716

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.

Sign up for GitHub

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

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Draft: [trello.com/c/avwmqc8i] Integration of SwiftUI PinPadView #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c89cbba
[trello.com/c/avWMqc8I] moved local authentication to async/await
art-divin Jan 13, 2025
a5b0d80
Merge branch 'develop' into trello.com/c/avWMqc8I
art-divin Jan 23, 2025
31786f2
Squashed commit of the following:
art-divin Jan 26, 2025
181a54d
[trello.com/c/avWMqc8I] integrating PinPadView WIP
art-divin Jan 31, 2025
0d16d05
[trello.com/c/avWMqc8I] fixed compilation error WIP
art-divin Feb 3, 2025
2dd373e
[trello.com/c/avWMqc8I] fixed compilation error WIP
art-divin Feb 6, 2025
478a19f
[trello.com/c/avWMqc8I] updating authentication service WIP
art-divin Feb 12, 2025
0b64543
[trello.com/c/avWMqc8I] updating authentication service WIP
art-divin Feb 12, 2025
c1c605e
[trello.com/c/avWMqc8I] refactoring of pinpadview
art-divin Feb 15, 2025
a7ec9b2
[trello.com/c/avWMqc8I] wrapped api into viewModel
art-divin Feb 16, 2025
e58c52d
[trello.com/c/avWMqc8I] setting style to new pinpad view
art-divin Feb 16, 2025
fc9a19d
[trello.com/c/avWMqc8I] adjusted fonts, colors and sizes
art-divin Feb 18, 2025
f455e7d
[trello.com/c/avWMqc8I] removed redundant Task.detached calls
art-divin Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 25 additions & 17 deletions Adamant.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,8 @@
A5F929AF262C857D00C3E60A /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5F929AE262C857D00C3E60A /* MarkdownKit */; };
A5F929B6262C858700C3E60A /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5F929B5262C858700C3E60A /* MarkdownKit */; };
A5F929B8262C858F00C3E60A /* MarkdownKit in Frameworks */ = {isa = PBXBuildFile; productRef = A5F929B7262C858F00C3E60A /* MarkdownKit */; };
D39AA7892D42745D0069BC73 /* PinPadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39AA7882D42745D0069BC73 /* PinPadView.swift */; };
D39AA78B2D47A0D80069BC73 /* LocalAuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D39AA78A2D47A0CC0069BC73 /* LocalAuthenticationService.swift */; };
E90055F520EBF5DA00D0CB2D /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E90055F420EBF5DA00D0CB2D /* AboutViewController.swift */; };
E90055F720EC200900D0CB2D /* SecurityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E90055F620EC200900D0CB2D /* SecurityViewController.swift */; };
E90055F920ECD86800D0CB2D /* SecurityViewController+StayIn.swift in Sources */ = {isa = PBXBuildFile; fileRef = E90055F820ECD86800D0CB2D /* SecurityViewController+StayIn.swift */; };
Expand Down Expand Up @@ -1108,6 +1110,8 @@
A5E0422A282AB18B0076CD13 /* BtcUnspentTransactionResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BtcUnspentTransactionResponse.swift; sourceTree = "<group>"; };
AD258997F050B24C0051CC8D /* Pods-Adamant.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.release.xcconfig"; path = "Target Support Files/Pods-Adamant/Pods-Adamant.release.xcconfig"; sourceTree = "<group>"; };
ADDFD2FA17E41CCBD11A1733 /* Pods-Adamant.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.debug.xcconfig"; path = "Target Support Files/Pods-Adamant/Pods-Adamant.debug.xcconfig"; sourceTree = "<group>"; };
D39AA7882D42745D0069BC73 /* PinPadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinPadView.swift; sourceTree = "<group>"; };
D39AA78A2D47A0CC0069BC73 /* LocalAuthenticationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAuthenticationService.swift; sourceTree = "<group>"; };
E90055F420EBF5DA00D0CB2D /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
E90055F620EC200900D0CB2D /* SecurityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecurityViewController.swift; sourceTree = "<group>"; };
E90055F820ECD86800D0CB2D /* SecurityViewController+StayIn.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SecurityViewController+StayIn.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2404,6 +2408,8 @@
E96D64C72295C44400CA5587 /* Data+utilites.swift */,
64A223D520F760BB005157CB /* Localization.swift */,
E9147B5E20500E9300145913 /* MyLittlePinpad+adamant.swift */,
D39AA7882D42745D0069BC73 /* PinPadView.swift */,
D39AA78A2D47A0CC0069BC73 /* LocalAuthenticationService.swift */,
E940088A2114F63000CD2D67 /* NSRegularExpression+adamant.swift */,
E9147B6220505C7500145913 /* QRCodeReader+adamant.swift */,
6414C18D217DF43100373FA6 /* String+adamant.swift */,
Expand Down Expand Up @@ -2873,8 +2879,8 @@
isa = PBXNativeTarget;
buildConfigurationList = E913C9001FFFA51E001A83F7 /* Build configuration list for PBXNativeTarget "Adamant" */;
buildPhases = (
9372E0412C9BC178006DF0B3 /* Run Script - Git Data */,
47866E9AB7D201F2CED0064C /* [CP] Check Pods Manifest.lock */,
9372E0412C9BC178006DF0B3 /* Run Script - Git Data */,
E913C8EA1FFFA51D001A83F7 /* Sources */,
E913C8EB1FFFA51D001A83F7 /* Frameworks */,
E913C8EC1FFFA51D001A83F7 /* Resources */,
Expand Down Expand Up @@ -3570,6 +3576,7 @@
E9AA8C02212C5BF500F9249F /* AdmWalletService+Send.swift in Sources */,
E90847332196FEA80095825D /* TransferTransaction+CoreDataProperties.swift in Sources */,
9366588D2B0AB6BD00BDB2D3 /* CoinsNodesListState.swift in Sources */,
D39AA78B2D47A0D80069BC73 /* LocalAuthenticationService.swift in Sources */,
E99818942120892F0018C84C /* WalletViewControllerBase.swift in Sources */,
3AA6DF462BA9BEB700EA2E16 /* MediaContentView.swift in Sources */,
E9B3D39E201F99F40019EB36 /* DataProvider.swift in Sources */,
Expand Down Expand Up @@ -3618,6 +3625,7 @@
E908471B2196FE590095825D /* Adamant.xcdatamodeld in Sources */,
E940087B2114ED0600CD2D67 /* EthWalletService.swift in Sources */,
93294B902AAD2C6B00911109 /* SwiftyOnboardOverlay.swift in Sources */,
D39AA7892D42745D0069BC73 /* PinPadView.swift in Sources */,
E948E03B20235E2300975D6B /* SettingsFactory.swift in Sources */,
4186B3302941E642006594A3 /* AdmWalletService+DynamicConstants.swift in Sources */,
E95F85852008CB3A0070534A /* ChatListViewController.swift in Sources */,
Expand Down Expand Up @@ -3929,7 +3937,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -3940,7 +3948,7 @@
MARKETING_VERSION = 3.10.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.MessageNotificationContentExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev-random1818.MessageNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -3959,7 +3967,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -3969,7 +3977,7 @@
);
MARKETING_VERSION = 3.10.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.MessageNotificationContentExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-random1818.MessageNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -4113,7 +4121,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
DISPLAY_NAME = ADM.Dev;
EXCLUDED_SOURCE_FILE_NAMES = "";
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -4124,7 +4132,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.10.0;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev-random1818";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -4144,7 +4152,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
DISPLAY_NAME = Adamant;
EXCLUDED_SOURCE_FILE_NAMES = Debug.xcassets;
GCC_NO_COMMON_BLOCKS = YES;
Expand All @@ -4155,7 +4163,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.10.0;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-random1818";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -4174,7 +4182,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -4185,7 +4193,7 @@
MARKETING_VERSION = 3.10.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.TransferNotificationContentExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev-random1818.TransferNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -4204,7 +4212,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -4214,7 +4222,7 @@
);
MARKETING_VERSION = 3.10.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.TransferNotificationContentExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-random1818TransferNotificationContentExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -4235,7 +4243,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -4246,7 +4254,7 @@
MARKETING_VERSION = 3.10.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.NotificationServiceExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev-random1818.NotificationServiceExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand All @@ -4265,7 +4273,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = J2L77FMN46;
DEVELOPMENT_TEAM = 23VNGWAPN4;
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
Expand All @@ -4275,7 +4283,7 @@
);
MARKETING_VERSION = 3.10.0;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.NotificationServiceExtension";
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-random1818.NotificationServiceExtension";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
Expand Down
4 changes: 2 additions & 2 deletions Adamant/Debug.entitlements
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.adamant.adamant-messenger</string>
<string>group.adamant.adamant-messenger-random1818</string>
</array>
<key>com.apple.security.device.camera</key>
<true/>
Expand All @@ -32,7 +32,7 @@
<true/>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)im.adamant.messenger-dev</string>
<string>$(AppIdentifierPrefix)im.adamant.messenger-dev-random1818</string>
</array>
</dict>
</plist>
Loading