Skip to content

Commit 0b04236

Browse files
boyarkin-antonboyarkin-anton
committed
Merge branch 'release/1.9.0'
2 parents 2346aac + 08062b1 commit 0b04236

File tree

73 files changed

+760
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+760
-179
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2825,10 +2825,12 @@
28252825
CLANG_ENABLE_OBJC_WEAK = YES;
28262826
CODE_SIGN_ENTITLEMENTS = MessageNotificationContentExtension/Debug.entitlements;
28272827
CODE_SIGN_STYLE = Manual;
2828+
CURRENT_PROJECT_VERSION = 106;
28282829
DEVELOPMENT_TEAM = J2L77FMN46;
28292830
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
28302831
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
28312832
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2833+
MARKETING_VERSION = 1.9.0;
28322834
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
28332835
MTL_FAST_MATH = YES;
28342836
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.MessageNotificationContentExtension";
@@ -2849,10 +2851,12 @@
28492851
CODE_SIGN_IDENTITY = "iPhone Distribution";
28502852
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
28512853
CODE_SIGN_STYLE = Manual;
2854+
CURRENT_PROJECT_VERSION = 106;
28522855
DEVELOPMENT_TEAM = J2L77FMN46;
28532856
INFOPLIST_FILE = MessageNotificationContentExtension/Info.plist;
28542857
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
28552858
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
2859+
MARKETING_VERSION = 1.9.0;
28562860
MTL_FAST_MATH = YES;
28572861
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.MessageNotificationContentExtension";
28582862
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2988,13 +2992,15 @@
29882992
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon_Debug;
29892993
CODE_SIGN_ENTITLEMENTS = Adamant/Debug.entitlements;
29902994
CODE_SIGN_STYLE = Manual;
2995+
CURRENT_PROJECT_VERSION = 106;
29912996
DEVELOPMENT_TEAM = J2L77FMN46;
29922997
DISPLAY_NAME = ADM.Dev;
29932998
EXCLUDED_SOURCE_FILE_NAMES = "";
29942999
INFOPLIST_FILE = Adamant/Info.plist;
29953000
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
29963001
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
29973002
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
3003+
MARKETING_VERSION = 1.9.0;
29983004
PRODUCT_NAME = "$(TARGET_NAME)";
29993005
PROVISIONING_PROFILE = "e4233bbf-3705-44fe-95b0-e77475672c60";
30003006
PROVISIONING_PROFILE_SPECIFIER = "ADAMANT Messenger Dev";
@@ -3012,12 +3018,14 @@
30123018
CODE_SIGN_IDENTITY = "iPhone Distribution";
30133019
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
30143020
CODE_SIGN_STYLE = Manual;
3021+
CURRENT_PROJECT_VERSION = 106;
30153022
DEVELOPMENT_TEAM = J2L77FMN46;
30163023
DISPLAY_NAME = Adamant;
30173024
EXCLUDED_SOURCE_FILE_NAMES = Debug.xcassets;
30183025
INFOPLIST_FILE = Adamant/Info.plist;
30193026
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30203027
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
3028+
MARKETING_VERSION = 1.9.0;
30213029
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
30223030
PRODUCT_NAME = "$(TARGET_NAME)";
30233031
PROVISIONING_PROFILE = "bedd1b75-2f23-4a85-a0b2-14c424fcff42";
@@ -3034,10 +3042,12 @@
30343042
CLANG_ENABLE_OBJC_WEAK = YES;
30353043
CODE_SIGN_ENTITLEMENTS = TransferNotificationContentExtension/Debug.entitlements;
30363044
CODE_SIGN_STYLE = Manual;
3045+
CURRENT_PROJECT_VERSION = 106;
30373046
DEVELOPMENT_TEAM = J2L77FMN46;
30383047
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
30393048
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30403049
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3050+
MARKETING_VERSION = 1.9.0;
30413051
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
30423052
MTL_FAST_MATH = YES;
30433053
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.TransferNotificationContentExtension";
@@ -3058,10 +3068,12 @@
30583068
CODE_SIGN_IDENTITY = "iPhone Distribution";
30593069
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
30603070
CODE_SIGN_STYLE = Manual;
3071+
CURRENT_PROJECT_VERSION = 106;
30613072
DEVELOPMENT_TEAM = J2L77FMN46;
30623073
INFOPLIST_FILE = TransferNotificationContentExtension/Info.plist;
30633074
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30643075
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3076+
MARKETING_VERSION = 1.9.0;
30653077
MTL_FAST_MATH = YES;
30663078
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.TransferNotificationContentExtension";
30673079
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -3080,10 +3092,12 @@
30803092
CLANG_ENABLE_OBJC_WEAK = YES;
30813093
CODE_SIGN_ENTITLEMENTS = NotificationServiceExtension/Debug.entitlements;
30823094
CODE_SIGN_STYLE = Manual;
3095+
CURRENT_PROJECT_VERSION = 106;
30833096
DEVELOPMENT_TEAM = J2L77FMN46;
30843097
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
30853098
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
30863099
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3100+
MARKETING_VERSION = 1.9.0;
30873101
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
30883102
MTL_FAST_MATH = YES;
30893103
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev.NotificationServiceExtension";
@@ -3104,10 +3118,12 @@
31043118
CODE_SIGN_IDENTITY = "iPhone Distribution";
31053119
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
31063120
CODE_SIGN_STYLE = Manual;
3121+
CURRENT_PROJECT_VERSION = 106;
31073122
DEVELOPMENT_TEAM = J2L77FMN46;
31083123
INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
31093124
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
31103125
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
3126+
MARKETING_VERSION = 1.9.0;
31113127
MTL_FAST_MATH = YES;
31123128
PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger.NotificationServiceExtension";
31133129
PRODUCT_NAME = "$(TARGET_NAME)";

‎Adamant.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict/>
4+
<dict>
5+
<key>PreviewsEnabled</key>
6+
<false/>
7+
</dict>
58
</plist>

‎Adamant/AppDelegate.swift

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
123123
let login = router.get(scene: AdamantScene.Login.login) as! LoginViewController
124124
let welcomeIsShown = UserDefaults.standard.bool(forKey: StoreKey.application.welcomeScreensIsShown)
125125
login.requestBiometryOnFirstTimeActive = welcomeIsShown
126+
login.modalPresentationStyle = .overFullScreen
126127
window!.rootViewController?.present(login, animated: false, completion: nil)
127128

128129
if !welcomeIsShown {
129130
let welcome = router.get(scene: AdamantScene.Onboard.welcome)
131+
welcome.modalPresentationStyle = .overFullScreen
130132
login.present(welcome, animated: true, completion: nil)
131133
UserDefaults.standard.set(true, forKey: StoreKey.application.welcomeScreensIsShown)
132134
}
@@ -406,6 +408,38 @@ extension AppDelegate {
406408
} else {
407409
unread = true
408410
}
411+
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+
}
409443

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

‎Adamant/Assets/Assets.xcassets/Buttons/ScrollDown.imageset/Contents.json

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

‎Adamant/Assets/Assets.xcassets/Buttons/ScrollDown.imageset/scrollDown.png

2.68 KB
Loading

‎Adamant/Assets/Assets.xcassets/Buttons/ScrollDown.imageset/scrollDown@2x.png

6.34 KB
Loading

‎Adamant/Assets/Assets.xcassets/Buttons/ScrollDown.imageset/scrollDown@3x.png

9.98 KB
Loading

‎Adamant/Assets/l18n/de.lproj/Localizable.strings

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@
7676
/* System accounts: ADAMANT iOS Support */
7777
"Accounts.iOSSupport" = "ADAMANT iOS Support";
7878

79+
/* System accounts: ADAMANT Exchange */
80+
"Accounts.AdamantExchange" = "ADAMANT Exchange";
81+
82+
/* System accounts: Bet on Bitcoin Price */
83+
"Accounts.BetOnBitcoin" = "Bet on Bitcoin price";
84+
7985
/* AccountsProvider: Address not valid error, %@ for address */
8086
"AccountsProvider.Error.AddressNotValidFormat" = "Ungültige Adresse: %@";
8187

@@ -253,6 +259,12 @@
253259
/* Known contacts: Adamant welcome message. Markdown supported. */
254260
"Chats.WelcomeMessage" = "ADAMANT ist ein Messenger, der vollständig auf der Blockchain funktioniert. Er ist unabhängig von Staaten, Konzernen und sogar Entwicklern. Das wird dank der dezentralen Netzinfrastruktur ermöglicht, deren Quellcode offen ist und die von Nutzern unterstützt wird. Deswegen kostet jede Transaktion wie Versand von Nachrichten oder Speichern von Kontakten eine Netzwerkgebühr von 0.001 ADM.\n\nDie Blockchain hilft, herausragende Sicherheit und Privatsphäre zu erlangen, die für keinen gewöhnlichen P2P- oder zentralisierten Messenger verfügbar ist. Außerdem stellt die Blockchain neue Möglichkeiten dar. Sie können Kryptowährungen in der Wallet aufbewahren sowie direkt im Chat versenden, ohne dabei die Kontrolle über Ihre privaten Schlüssel zu verlieren, oder auch ADAMANT als eine 2FA-Lösung verwenden.\n\nIn ADAMANT kann kein Konto kontrolliert, geblockt, deaktiviert, eingeschränkt oder zensiert werden. Alle Nutzer tragen die volle Verantwortung für die Inhalte, Nachrichten, Medien, Absichten und Ziele bei der Nutzung des Messenger.\n\nBedenken Sie, dass Sicherheit und Anonymität auch von Ihnen selbst abhängt. Folgen Sie keinen Links in den Chats, andernfalls kann Ihre IP-Adresse für Dritte sichtbar werden. Verwenden Sie einen PIN-Code auf Ihrem Gerät. Mehr Informationen zu Sicherheit und Anonymität lesen Sie hier: https://adamant.im/ru-staysecured/.\n\nVergewissern Sie sich, dass sie die Passphrase von Ihrem Konto gespeichert haben – loggen Sie sich aus und wieder ein. Schreiben Sie die Passphrase auf einem Stück Papier. Nur Sie tragen die Verantwortung für die sichere Aufbewahrung Ihrer Passphrase. Diese kann nämlich nicht wiederhergestellt werden. Gelangt Sie in die Hände Dritter, verlieren Sie Ihr Geld und Ihr Chatverlauf wird gelesen. Behandeln Sie Ihre Passphrase so, als würden Tokens in Ihrer Wallet 1.000.000.000 Dollar kosten.\n\nUm mit einer Konversation zu beginnen, erhalten Sie zuerst kostenlose Tokens im Account-Tab. Erstellen Sie einen neuen Chat und geben Sie die ADM-Adresse Ihres Gesprächspartners. Zeigen Sie Ihre ADM-Adresse persönlich und senden Sie sie nicht über andere Messenger.";
255261

262+
/* Known contacts: Adamant Exchenge message. Markdown supported. */
263+
"Chats.Exchange.WelcomeMessage" = "Hi! 😊 I'm your exchange bot. I operate instantly and anonymously. Type **/help** to see what I can do. I ask for a higher fee than my fellow bots, so I recommend that you set up your own bot with a competitive fee. ℹ️ You can learn more on ADAMANT blog. I'm highly reliable but if you have any troubles, please leave a message here U15738334853882270577.";
264+
265+
/* Known contacts: Adamant Bet On Bitcoin message. Markdown supported. */
266+
"Chats.BetOnBitcoin.WelcomeMessage" = "Hi! 😊 I'm anonymous and Blockchain-proved bet bot. I accept bets on BTC rate and pay rewards to winners. ℹ️ Learn more on ADAMANT’s blog or type **/help** to start betting. Support via U15738334853882270577.";
267+
256268
/* Alert 'Retry Or Delete' title. Used in chat for sending failed messages again or delete them */
257269
"Chats.RetryOrDelete.Title" = "Erneut versuchen oder löschen?";
258270

@@ -817,6 +829,12 @@
817829
/* Wallet Services: Transaction unavailable */
818830
"WalletServices.SharedErrors.transactionUnavailable" = "Transaktion nicht verfügbar";
819831

832+
/* Wallet Services: Duplicated transaction */
833+
"WalletServices.SharedErrors.duplicatedTransaction" = "Doppelte transaktion";
834+
835+
/* Wallet Services: Cannot verify transaction */
836+
"WalletServices.SharedErrors.inconsistentTransaction" = "Transaktion kann nicht verifiziert werden";
837+
820838
/* Welcome: Skip button */
821839
"WelcomeScene.Skip" = "überspringen";
822840

‎Adamant/Assets/l18n/en.lproj/Localizable.strings

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,12 @@
7979
/* System accounts: ADAMANT iOS Support */
8080
"Accounts.iOSSupport" = "ADAMANT iOS Support";
8181

82+
/* System accounts: ADAMANT Exchange */
83+
"Accounts.AdamantExchange" = "ADAMANT Exchange";
84+
85+
/* System accounts: Bet on Bitcoin Price */
86+
"Accounts.BetOnBitcoin" = "Bet on Bitcoin price";
87+
8288
/* AccountsProvider: Address not valid error, %@ for address */
8389
"AccountsProvider.Error.AddressNotValidFormat" = "Invalid address: %@";
8490

@@ -250,6 +256,12 @@
250256
/* Known contacts: Adamant welcome message. Markdown supported. */
251257
"Chats.WelcomeMessage" = "ADAMANT is a true Blockchain messenger, independent from governments, corporations and even developers. It is possible due to a decentralized network infrastructure, fully open source and run by users. That's why every action, including sending message or saving contact name, has its network fee of 0.001 ADM.\n\nBlockchain offers superior security and privacy, not available for typical P2P and centralized messengers. Also, Blockchain provides new possibilities. You can store and transfer cryptos In-Chat with full control of your private keys, use ADAMANT as 2FA and more.\n\nIn ADAMANT, nobody can control, block, deactivate, restrict or censor accounts. Users take full responsibility for content, messages, media, and goals and intentions of using the Messenger.\n\nRemember, your security and anonymity is up to you. Do not follow links you receive, otherwise your IP can be compromised. Set a password on your device. Learn more about security and anonymity at https://adamant.im/staysecured/.\n\nMake sure you've saved the passPhrase for this account — logout and login again. Write your passPhrase on a sheet of paper as well. Only **you are responsible for passPhrase safety**. It cannot be recovered. And if other person will get it, your tokens will be stolen and correspondence read. Treat this question with outmost importance, as if tokens in your wallet will cost a billion dollars some time.\n\nTo start messaging now, **get free welcome tokens** on Account tab. Then create new chat and put your friend's ADM address. It is recommended to share your ADM address personally, not using other messengers.";
252258

259+
/* Known contacts: Adamant Exchenge message. Markdown supported. */
260+
"Chats.Exchange.WelcomeMessage" = "Hi! 😊 I'm your exchange bot. I operate instantly and anonymously. Type **/help** to see what I can do. I ask for a higher fee than my fellow bots, so I recommend that you set up your own bot with a competitive fee. ℹ️ You can learn more on ADAMANT blog. I'm highly reliable but if you have any troubles, please leave a message here U15738334853882270577.";
261+
262+
/* Known contacts: Adamant Bet On Bitcoin message. Markdown supported. */
263+
"Chats.BetOnBitcoin.WelcomeMessage" = "Hi! 😊 I'm anonymous and Blockchain-proved bet bot. I accept bets on BTC rate and pay rewards to winners. ℹ️ Learn more on ADAMANT’s blog or type **/help** to start betting. Support via U15738334853882270577.";
264+
253265
/* Alert 'Retry Or Delete' title. Used in caht for sending failed messages again or delete them */
254266
"Chats.RetryOrDelete.Title" = "Retry or delete?";
255267

@@ -868,6 +880,12 @@
868880
/* Wallet Services: Transaction unavailable */
869881
"WalletServices.SharedErrors.transactionUnavailable" = "Transaction unavailable";
870882

883+
/* Wallet Services: Duplicated transaction */
884+
"WalletServices.SharedErrors.duplicatedTransaction" = "Duplicated transaction";
885+
886+
/* Wallet Services: Cannot verify transaction */
887+
"WalletServices.SharedErrors.inconsistentTransaction" = "Cannot verify transaction";
888+
871889
/* Welcome: Skip button */
872890
"WelcomeScene.Skip" = "skip";
873891

0 commit comments

Comments
 (0)