Skip to content

Commit 0d98f7f

Browse files
boyarkin-antonboyarkin-anton
committed
Merge branch 'release/1.9.1'
2 parents 0b04236 + 6d4728c commit 0d98f7f

28 files changed

+697
-77
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
6455E9F121075D3600B2E94C /* AddressBookService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6455E9F021075D3600B2E94C /* AddressBookService.swift */; };
3939
6455E9F321075D8000B2E94C /* AdamantAddressBookService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6455E9F221075D8000B2E94C /* AdamantAddressBookService.swift */; };
4040
6458548C211B3AB1004C5909 /* WelcomeViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6458548A211B3AB1004C5909 /* WelcomeViewController.xib */; };
41+
645938942378395E00A2BE7C /* EulaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645938922378395E00A2BE7C /* EulaViewController.swift */; };
42+
645938952378395E00A2BE7C /* EulaViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 645938932378395E00A2BE7C /* EulaViewController.xib */; };
4143
645AE06621E67D3300AD3623 /* UITextField+adamant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645AE06521E67D3300AD3623 /* UITextField+adamant.swift */; };
4244
645FEB34213E72C100D6BA2D /* OnboardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 645FEB32213E72C100D6BA2D /* OnboardViewController.swift */; };
4345
645FEB35213E72C100D6BA2D /* OnboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 645FEB33213E72C100D6BA2D /* OnboardViewController.xib */; };
@@ -72,6 +74,7 @@
7274
64AE84622300012400F38FBD /* DashProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AE845F2300012200F38FBD /* DashProvider.swift */; };
7375
64BD2B7520E2814B00E2CD36 /* EthTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BD2B7420E2814B00E2CD36 /* EthTransaction.swift */; };
7476
64BD2B7720E2820300E2CD36 /* TransactionDetails.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64BD2B7620E2820300E2CD36 /* TransactionDetails.swift */; };
77+
64C65F4523893C7600DC0425 /* OnboardOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64C65F4423893C7600DC0425 /* OnboardOverlay.swift */; };
7578
64D059FF20D3116B003AD655 /* NodesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D059FE20D3116A003AD655 /* NodesListViewController.swift */; };
7679
64E1C82D222E95E2006C4DA7 /* DogeWalletRoutes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E1C82C222E95E2006C4DA7 /* DogeWalletRoutes.swift */; };
7780
64E1C82F222E95F6006C4DA7 /* DogeWallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E1C82E222E95F6006C4DA7 /* DogeWallet.swift */; };
@@ -563,6 +566,8 @@
563566
6455E9F021075D3600B2E94C /* AddressBookService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressBookService.swift; sourceTree = "<group>"; };
564567
6455E9F221075D8000B2E94C /* AdamantAddressBookService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantAddressBookService.swift; sourceTree = "<group>"; };
565568
6458548A211B3AB1004C5909 /* WelcomeViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WelcomeViewController.xib; sourceTree = "<group>"; };
569+
645938922378395E00A2BE7C /* EulaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EulaViewController.swift; sourceTree = "<group>"; };
570+
645938932378395E00A2BE7C /* EulaViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EulaViewController.xib; sourceTree = "<group>"; };
566571
645AE06521E67D3300AD3623 /* UITextField+adamant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextField+adamant.swift"; sourceTree = "<group>"; };
567572
645E7B052111DF3A006CC9FD /* Crypto.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Crypto.swift; sourceTree = "<group>"; };
568573
645FEB32213E72C100D6BA2D /* OnboardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardViewController.swift; sourceTree = "<group>"; };
@@ -598,6 +603,7 @@
598603
64AE845F2300012200F38FBD /* DashProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashProvider.swift; sourceTree = "<group>"; };
599604
64BD2B7420E2814B00E2CD36 /* EthTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthTransaction.swift; sourceTree = "<group>"; };
600605
64BD2B7620E2820300E2CD36 /* TransactionDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionDetails.swift; sourceTree = "<group>"; };
606+
64C65F4423893C7600DC0425 /* OnboardOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardOverlay.swift; sourceTree = "<group>"; };
601607
64D059FE20D3116A003AD655 /* NodesListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodesListViewController.swift; sourceTree = "<group>"; };
602608
64E1C82C222E95E2006C4DA7 /* DogeWalletRoutes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogeWalletRoutes.swift; sourceTree = "<group>"; };
603609
64E1C82E222E95F6006C4DA7 /* DogeWallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogeWallet.swift; sourceTree = "<group>"; };
@@ -1284,7 +1290,10 @@
12841290
E9332B8721F1F9D100D56E72 /* Onboard */ = {
12851291
isa = PBXGroup;
12861292
children = (
1293+
64C65F4423893C7600DC0425 /* OnboardOverlay.swift */,
12871294
E9332B8821F1FA4400D56E72 /* OnboardRoutes.swift */,
1295+
645938922378395E00A2BE7C /* EulaViewController.swift */,
1296+
645938932378395E00A2BE7C /* EulaViewController.xib */,
12881297
645FEB32213E72C100D6BA2D /* OnboardViewController.swift */,
12891298
645FEB33213E72C100D6BA2D /* OnboardViewController.xib */,
12901299
644793C22166314A00FC4CF5 /* OnboardPage.swift */,
@@ -2036,6 +2045,7 @@
20362045
E9981892212088DE0018C84C /* NodeCell.xib in Resources */,
20372046
E9B4E1AA210F1803007E77FC /* DoubleDetailsTableViewCell.xib in Resources */,
20382047
6458548C211B3AB1004C5909 /* WelcomeViewController.xib in Resources */,
2048+
645938952378395E00A2BE7C /* EulaViewController.xib in Resources */,
20392049
E9EC341D200524CA00C0E546 /* Roboto_400_normal.ttf in Resources */,
20402050
E9A174B920587B84003667CD /* notification.mp3 in Resources */,
20412051
E9EC3418200524CA00C0E546 /* Exo+2_400_normal.ttf in Resources */,
@@ -2573,6 +2583,7 @@
25732583
E9502740202E257E002C1098 /* RepeaterService.swift in Sources */,
25742584
E93D7AC02052CF63005D19DC /* AdamantNotificationService.swift in Sources */,
25752585
E9771D7B2299456A0099AAC7 /* AdamantSecret.swift in Sources */,
2586+
645938942378395E00A2BE7C /* EulaViewController.swift in Sources */,
25762587
649D6BEC21BD5A53009E727B /* UISuffixTextField.swift in Sources */,
25772588
E93B0D762028B28E00126346 /* AdamantChatsProvider.swift in Sources */,
25782589
E993302021354B1800CD5200 /* AdmWalletRoutes.swift in Sources */,
@@ -2589,6 +2600,7 @@
25892600
E96D64B42295BED700CA5587 /* StateAsset.swift in Sources */,
25902601
E9771D9E22997A6F0099AAC7 /* NativeCore+AdamantCore.swift in Sources */,
25912602
E921534E20EE1E8700C0843F /* EurekaAlertLabelRow.swift in Sources */,
2603+
64C65F4523893C7600DC0425 /* OnboardOverlay.swift in Sources */,
25922604
E9484B79227C617E008E10F0 /* BalanceTableViewCell.swift in Sources */,
25932605
E90847352196FEA80095825D /* MessageTransaction+CoreDataProperties.swift in Sources */,
25942606
E9771DA722997F310099AAC7 /* ServerResponseWithTimestamp.swift in Sources */,
@@ -2825,12 +2837,12 @@
28252837
CLANG_ENABLE_OBJC_WEAK = YES;
28262838
CODE_SIGN_ENTITLEMENTS = MessageNotificationContentExtension/Debug.entitlements;
28272839
CODE_SIGN_STYLE = Manual;
2828-
CURRENT_PROJECT_VERSION = 106;
2840+
CURRENT_PROJECT_VERSION = 111;
28292841
DEVELOPMENT_TEAM = J2L77FMN46;
28302842
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
28312843
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
28322844
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2833-
MARKETING_VERSION = 1.9.0;
2845+
MARKETING_VERSION = 1.9.1;
28342846
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
28352847
MTL_FAST_MATH = YES;
28362848
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.MessageNotificationContentExtension";
@@ -2851,12 +2863,12 @@
28512863
CODE_SIGN_IDENTITY = "iPhone Distribution";
28522864
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
28532865
CODE_SIGN_STYLE = Manual;
2854-
CURRENT_PROJECT_VERSION = 106;
2866+
CURRENT_PROJECT_VERSION = 111;
28552867
DEVELOPMENT_TEAM = J2L77FMN46;
28562868
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
28572869
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
28582870
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2859-
MARKETING_VERSION = 1.9.0;
2871+
MARKETING_VERSION = 1.9.1;
28602872
MTL_FAST_MATH = YES;
28612873
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.MessageNotificationContentExtension";
28622874
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2992,15 +3004,15 @@
29923004
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Debug;
29933005
CODE_SIGN_ENTITLEMENTS = Adamant/Debug.entitlements;
29943006
CODE_SIGN_STYLE = Manual;
2995-
CURRENT_PROJECT_VERSION = 106;
3007+
CURRENT_PROJECT_VERSION = 111;
29963008
DEVELOPMENT_TEAM = J2L77FMN46;
29973009
DISPLAY_NAME = ADM.Dev;
29983010
EXCLUDED_SOURCE_FILE_NAMES = "";
29993011
INFOPLIST_FILE = Adamant/Info.plist;
30003012
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30013013
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
3014+
MARKETING_VERSION = 1.9.1;
30023015
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
3003-
MARKETING_VERSION = 1.9.0;
30043016
PRODUCT_NAME = "$(TARGET_NAME)";
30053017
PROVISIONING_PROFILE = "e4233bbf-3705-44fe-95b0-e77475672c60";
30063018
PROVISIONING_PROFILE_SPECIFIER = "ADAMANT Messenger Dev";
@@ -3018,14 +3030,14 @@
30183030
CODE_SIGN_IDENTITY = "iPhone Distribution";
30193031
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
30203032
CODE_SIGN_STYLE = Manual;
3021-
CURRENT_PROJECT_VERSION = 106;
3033+
CURRENT_PROJECT_VERSION = 111;
30223034
DEVELOPMENT_TEAM = J2L77FMN46;
30233035
DISPLAY_NAME = Adamant;
30243036
EXCLUDED_SOURCE_FILE_NAMES = Debug.xcassets;
30253037
INFOPLIST_FILE = Adamant/Info.plist;
30263038
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30273039
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
3028-
MARKETING_VERSION = 1.9.0;
3040+
MARKETING_VERSION = 1.9.1;
30293041
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
30303042
PRODUCT_NAME = "$(TARGET_NAME)";
30313043
PROVISIONING_PROFILE = "bedd1b75-2f23-4a85-a0b2-14c424fcff42";
@@ -3042,12 +3054,12 @@
30423054
CLANG_ENABLE_OBJC_WEAK = YES;
30433055
CODE_SIGN_ENTITLEMENTS = TransferNotificationContentExtension/Debug.entitlements;
30443056
CODE_SIGN_STYLE = Manual;
3045-
CURRENT_PROJECT_VERSION = 106;
3057+
CURRENT_PROJECT_VERSION = 111;
30463058
DEVELOPMENT_TEAM = J2L77FMN46;
30473059
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
30483060
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30493061
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3050-
MARKETING_VERSION = 1.9.0;
3062+
MARKETING_VERSION = 1.9.1;
30513063
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
30523064
MTL_FAST_MATH = YES;
30533065
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.TransferNotificationContentExtension";
@@ -3068,12 +3080,12 @@
30683080
CODE_SIGN_IDENTITY = "iPhone Distribution";
30693081
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
30703082
CODE_SIGN_STYLE = Manual;
3071-
CURRENT_PROJECT_VERSION = 106;
3083+
CURRENT_PROJECT_VERSION = 111;
30723084
DEVELOPMENT_TEAM = J2L77FMN46;
30733085
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
30743086
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30753087
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3076-
MARKETING_VERSION = 1.9.0;
3088+
MARKETING_VERSION = 1.9.1;
30773089
MTL_FAST_MATH = YES;
30783090
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.TransferNotificationContentExtension";
30793091
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3092,12 +3104,12 @@
30923104
CLANG_ENABLE_OBJC_WEAK = YES;
30933105
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/Debug.entitlements;
30943106
CODE_SIGN_STYLE = Manual;
3095-
CURRENT_PROJECT_VERSION = 106;
3107+
CURRENT_PROJECT_VERSION = 111;
30963108
DEVELOPMENT_TEAM = J2L77FMN46;
30973109
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
30983110
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30993111
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3100-
MARKETING_VERSION = 1.9.0;
3112+
MARKETING_VERSION = 1.9.1;
31013113
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
31023114
MTL_FAST_MATH = YES;
31033115
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.NotificationServiceExtension";
@@ -3118,12 +3130,12 @@
31183130
CODE_SIGN_IDENTITY = "iPhone Distribution";
31193131
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
31203132
CODE_SIGN_STYLE = Manual;
3121-
CURRENT_PROJECT_VERSION = 106;
3133+
CURRENT_PROJECT_VERSION = 111;
31223134
DEVELOPMENT_TEAM = J2L77FMN46;
31233135
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
31243136
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
31253137
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3126-
MARKETING_VERSION = 1.9.0;
3138+
MARKETING_VERSION = 1.9.1;
31273139
MTL_FAST_MATH = YES;
31283140
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.NotificationServiceExtension";
31293141
PRODUCT_NAME = "$(TARGET_NAME)";

‎Adamant/AppDelegate.swift

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ extension StoreKey {
2828
struct application {
2929
static let deviceTokenHash = "app.deviceTokenHash"
3030
static let welcomeScreensIsShown = "app.welcomeScreensIsShown"
31+
static let eulaAccepted = "app.eulaAccepted"
3132
static let firstRun = "app.firstRun"
3233

3334
private init() {}
@@ -122,6 +123,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
122123
// MARK: 4. Show login
123124
let login = router.get(scene: AdamantScene.Login.login) as! LoginViewController
124125
let welcomeIsShown = UserDefaults.standard.bool(forKey: StoreKey.application.welcomeScreensIsShown)
126+
125127
login.requestBiometryOnFirstTimeActive = welcomeIsShown
126128
login.modalPresentationStyle = .overFullScreen
127129
window!.rootViewController?.present(login, animated: false, completion: nil)
@@ -409,37 +411,37 @@ extension AppDelegate {
409411
unread = true
410412
}
411413

412-
if let exchenge = AdamantContacts.adamantExchange.messages["chats.welcome_message"] {
413-
chatProvider.fakeReceived(message: exchenge.message,
414-
senderId: AdamantContacts.adamantExchange.address,
415-
date: Date.adamantNullDate,
416-
unread: false,
417-
silent: exchenge.silentNotification,
418-
showsChatroom: true,
419-
completion: { result in
420-
guard case let .failure(error) = result else {
421-
return
422-
}
423-
424-
print("ERROR showing exchenge message: \(error.message)")
425-
})
426-
}
427-
428-
if let betOnBitcoin = AdamantContacts.betOnBitcoin.messages["chats.welcome_message"] {
429-
chatProvider.fakeReceived(message: betOnBitcoin.message,
430-
senderId: AdamantContacts.betOnBitcoin.address,
431-
date: Date.adamantNullDate,
432-
unread: false,
433-
silent: betOnBitcoin.silentNotification,
434-
showsChatroom: true,
435-
completion: { result in
436-
guard case let .failure(error) = result else {
437-
return
438-
}
439-
440-
print("ERROR showing exchenge message: \(error.message)")
441-
})
442-
}
414+
// if let exchenge = AdamantContacts.adamantExchange.messages["chats.welcome_message"] {
415+
// chatProvider.fakeReceived(message: exchenge.message,
416+
// senderId: AdamantContacts.adamantExchange.address,
417+
// date: Date.adamantNullDate,
418+
// unread: false,
419+
// silent: exchenge.silentNotification,
420+
// showsChatroom: true,
421+
// completion: { result in
422+
// guard case let .failure(error) = result else {
423+
// return
424+
// }
425+
//
426+
// print("ERROR showing exchenge message: \(error.message)")
427+
// })
428+
// }
429+
//
430+
// if let betOnBitcoin = AdamantContacts.betOnBitcoin.messages["chats.welcome_message"] {
431+
// chatProvider.fakeReceived(message: betOnBitcoin.message,
432+
// senderId: AdamantContacts.betOnBitcoin.address,
433+
// date: Date.adamantNullDate,
434+
// unread: false,
435+
// silent: betOnBitcoin.silentNotification,
436+
// showsChatroom: true,
437+
// completion: { result in
438+
// guard case let .failure(error) = result else {
439+
// return
440+
// }
441+
//
442+
// print("ERROR showing exchenge message: \(error.message)")
443+
// })
444+
// }
443445

444446
if let welcome = AdamantContacts.adamantBountyWallet.messages["chats.welcome_message"] {
445447
chatProvider.fakeReceived(message: welcome.message,

‎Adamant/Assets/Assets.xcassets/Swipe actions/swipe_block.imageset/Contents.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "cross.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "cross@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "cross@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎Adamant/Assets/Assets.xcassets/Swipe actions/swipe_block.imageset/cross.png

580 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Swipe actions/swipe_block.imageset/cross@2x.png

1.27 KB
Loading

‎Adamant/Assets/Assets.xcassets/Swipe actions/swipe_block.imageset/cross@3x.png

2.29 KB
Loading

0 commit comments

Comments
 (0)