Skip to content

Commit d650c16

Browse files
committed
Merge branch 'release/0.3.11'
2 parents f3208ce + 44fe85b commit d650c16

40 files changed

+1710
-347
lines changed

Adamant.xcodeproj/project.pbxproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
4411402421C8B290703B13EB /* Pods_Adamant.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C107D5CB65B4D728B9D97C0F /* Pods_Adamant.framework */; };
11+
64D059FF20D3116B003AD655 /* NodesListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64D059FE20D3116A003AD655 /* NodesListViewController.swift */; };
1112
E905D39B2048A9BD00DDB504 /* KeychainStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39A2048A9BD00DDB504 /* KeychainStore.swift */; };
1213
E905D39D204C13B900DDB504 /* SecuredStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39C204C13B900DDB504 /* SecuredStore.swift */; };
1314
E905D39F204C281400DDB504 /* LoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E905D39E204C281400DDB504 /* LoginViewController.swift */; };
@@ -179,6 +180,7 @@
179180
/* End PBXContainerItemProxy section */
180181

181182
/* Begin PBXFileReference section */
183+
64D059FE20D3116A003AD655 /* NodesListViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NodesListViewController.swift; sourceTree = "<group>"; };
182184
871009461457F6B7B47D99C5 /* Pods-Adamant.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Adamant/Pods-Adamant.debug.xcconfig"; sourceTree = "<group>"; };
183185
903AC078A8A55175A05E42D4 /* Pods-Adamant.testing.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Adamant.testing.xcconfig"; path = "Pods/Target Support Files/Pods-Adamant/Pods-Adamant.testing.xcconfig"; sourceTree = "<group>"; };
184186
C107D5CB65B4D728B9D97C0F /* Pods_Adamant.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Adamant.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -193,6 +195,9 @@
193195
E90A4944204C5F60009F6A65 /* PassphraseCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PassphraseCell.xib; sourceTree = "<group>"; };
194196
E90A494A204D9EB8009F6A65 /* AdamantAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantAuthentication.swift; sourceTree = "<group>"; };
195197
E90A494C204DA932009F6A65 /* LocalAuthentication.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalAuthentication.swift; sourceTree = "<group>"; };
198+
E91319F820CEC4E100192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
199+
E91319F920CEC4E200192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
200+
E91319FA20CEC4E200192A18 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
196201
E913C8EE1FFFA51D001A83F7 /* Adamant.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Adamant.app; sourceTree = BUILT_PRODUCTS_DIR; };
197202
E913C8F11FFFA51D001A83F7 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
198203
E913C8F81FFFA51D001A83F7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -647,6 +652,7 @@
647652
E982F69B20235B4D00566AC7 /* SettingsViewController.swift */,
648653
E93D7AC12052EE21005D19DC /* SettingsViewController+StayIn.swift */,
649654
E9942B7F203C058C00C163AF /* QRGeneratorViewController.swift */,
655+
64D059FE20D3116A003AD655 /* NodesListViewController.swift */,
650656
E91A0639209F05AA0018A102 /* NotificationsViewController.swift */,
651657
);
652658
path = Settings;
@@ -839,6 +845,7 @@
839845
knownRegions = (
840846
en,
841847
ru,
848+
de,
842849
);
843850
mainGroup = E913C8E51FFFA51D001A83F7;
844851
productRefGroup = E913C8EF1FFFA51D001A83F7 /* Products */;
@@ -1086,6 +1093,7 @@
10861093
E91947AC20001A9A001362F8 /* ApiService.swift in Sources */,
10871094
E9150B9F2066DA210065A985 /* MessageTransaction+CoreDataClass.swift in Sources */,
10881095
E965A53020B594120041A3EA /* AdamantApi+States.swift in Sources */,
1096+
64D059FF20D3116B003AD655 /* NodesListViewController.swift in Sources */,
10891097
E9150B982066DA210065A985 /* CoreDataAccount+CoreDataProperties.swift in Sources */,
10901098
E9B3D3A1201FA26B0019EB36 /* AdamantAccountsProvider.swift in Sources */,
10911099
E9FAE5DA203DBFEF008D3A6B /* Comparable+clamped.swift in Sources */,
@@ -1154,6 +1162,7 @@
11541162
children = (
11551163
E95CB452205D77B200A7218E /* en */,
11561164
E95CB45A205D77DD00A7218E /* ru */,
1165+
E91319FA20CEC4E200192A18 /* de */,
11571166
);
11581167
name = InfoPlist.strings;
11591168
sourceTree = "<group>";
@@ -1163,6 +1172,7 @@
11631172
children = (
11641173
E95CB457205D77B500A7218E /* en */,
11651174
E95CB459205D77DC00A7218E /* ru */,
1175+
E91319F920CEC4E200192A18 /* de */,
11661176
);
11671177
name = Localizable.strings;
11681178
sourceTree = "<group>";
@@ -1172,6 +1182,7 @@
11721182
children = (
11731183
E95CB45F205D7F9600A7218E /* en */,
11741184
E95CB461205D7FD000A7218E /* ru */,
1185+
E91319F820CEC4E100192A18 /* de */,
11751186
);
11761187
name = Localizable.stringsdict;
11771188
sourceTree = "<group>";

Adamant/AppDelegate.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -332,20 +332,20 @@ extension AppDelegate {
332332
}
333333

334334
if let welcome = AdamantContacts.adamantBountyWallet.messages["chats.welcome_message"] {
335-
chatProvider.fakeReceived(message: welcome,
335+
chatProvider.fakeReceived(message: welcome.message,
336336
senderId: AdamantContacts.adamantBountyWallet.name,
337337
date: Date.adamantNullDate,
338338
unread: unread,
339-
silent: true,
339+
silent: welcome.silentNotification,
340340
completion: { _ in })
341341
}
342342

343343
if let ico = AdamantContacts.adamantIco.messages["chats.ico_message"] {
344-
chatProvider.fakeReceived(message: ico,
344+
chatProvider.fakeReceived(message: ico.message,
345345
senderId: AdamantContacts.adamantIco.name,
346346
date: Date.adamantNullDate,
347347
unread: unread,
348-
silent: true,
348+
silent: ico.silentNotification,
349349
completion: { _ in })
350350
}
351351
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/* Bundle display name */
2+
"CFBundleDisplayName" = "Adamant";
3+
4+
/* Bundle name */
5+
"CFBundleName" = "Adamant";
6+
7+
/* Privacy - Camera Usage Description */
8+
"NSCameraUsageDescription" = "The camera needed to scan QR codes for addresses and passphrases";
9+
10+
/* Privacy - Face ID Usage Description */
11+
"NSFaceIDUsageDescription" = "Sign In into your ADAMANT with Face ID";
12+
13+
/* Privacy - Photo Library Additions Usage Description */
14+
"NSPhotoLibraryAddUsageDescription" = "Saving generated QR codes with passphrases and addresses";
15+
16+
/* Privacy - Photo Library Usage Description */
17+
"NSPhotoLibraryUsageDescription" = "Reading QR codes with passphrases and addresses";
18+

0 commit comments

Comments
 (0)