Skip to content

Commit b35114e

Browse files
RealBonusRealBonus
committed
Merge branch 'release/1.5'
2 parents bf6d897 + d6e574d commit b35114e

File tree

59 files changed

+2690
-280
lines changed

Some content is hidden

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

59 files changed

+2690
-280
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 71 additions & 5 deletions
Large diffs are not rendered by default.

‎Adamant.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎Adamant/AppDelegate.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ struct AdamantResources {
5656
static let lskServers = [
5757
"https://lisknode1.adamant.im"
5858
]
59+
60+
static let dogeServers: [URL] = [
61+
URL(string: "https://dogenode1.adamant.im/api")!
62+
]
5963

6064
// MARK: ADAMANT Addresses
6165
static let supportEmail = "ios@adamant.im"
@@ -85,6 +89,8 @@ struct AdamantResources {
8589
static let liskExplorerAddress = "https://explorer.lisk.io/tx/"
8690
// static let liskExplorerAddress = "https://testnet-explorer.lisk.io/tx/" // LISK Testnet
8791

92+
static let dogeExplorerAddress = "https://dogechain.info/tx/"
93+
8894
private init() {}
8995
}
9096

‎Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/wallet_lsk.png

-1.25 KB
Binary file not shown.

‎Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/wallet_lsk@2x.png

-2.62 KB
Binary file not shown.

‎Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/wallet_lsk@3x.png

-4.08 KB
Binary file not shown.

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.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" : "wallet_doge.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "wallet_doge@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "wallet_doge@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/wallet_doge.png

8.88 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/wallet_doge@2x.png

21.8 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/wallet_doge@3x.png

37.3 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/wallet_eth.png

346 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/wallet_eth@2x.png

639 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/wallet_eth@3x.png

806 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/Contents.json renamed to ‎Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/Contents.json

File renamed without changes.

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/wallet_lsk.png

2.1 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/wallet_lsk@2x.png

4.37 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/wallet_lsk@3x.png

6.76 KB
Loading

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,12 @@
130130
/* Account tab: 'Send ETH tokens' button */
131131
"AccountTab.Row.SendEth" = "ETH senden";
132132

133-
/* Account tab: 'Send ETH tokens' button */
133+
/* Account tab: 'Send LSK tokens' button */
134134
"AccountTab.Row.SendLsk" = "LSK senden";
135135

136+
/* Account tab: 'Send DOGE tokens' button */
137+
"AccountTab.Row.SendDoge" = "DOGE senden";
138+
136139
/* Account tab: Anonymously buy ADM tokens */
137140
"AccountTab.Row.AnonymouslyBuyADM" = "Kaufen Sie ADM anonym";
138141

@@ -155,7 +158,7 @@
155158
"AccountTab.Row.About" = "Über ADAMANT";
156159

157160
/* Account tab: 'Vote for delegates' button */
158-
"AccountTab.Row.VoteForDelegates" = "Delegate wählen";
161+
"AccountTab.Row.VoteForDelegates" = "Delegierte wählen";
159162

160163
/* Account tab: Actions section title */
161164
"AccountTab.Section.Actions" = "Aktionen";
@@ -172,11 +175,14 @@
172175
/* Account tab: Lisk wallet */
173176
"AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";
174177

178+
/* Account tab: Doge wallet */
179+
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";
180+
175181
/* Account page: scene title */
176182
"AccountTab.Title" = "Konto";
177183

178184
/* Account tab: Delegates section title */
179-
"AccountTab.Section.Delegates" = "Delegate";
185+
"AccountTab.Section.Delegates" = "Delegierte";
180186

181187
/* Product name */
182188
"ADAMANT" = "ADAMANT";
@@ -284,7 +290,7 @@
284290
"ChatScene.Warning.UnsupportedUrl" = "Nicht unterstütztes URL-Protokoll";
285291

286292
/* Delegates page: scene title */
287-
"Delegates.Title" = "Delegate";
293+
"Delegates.Title" = "Delegierte";
288294

289295
/* Delegates tab: Message about 50 ADM fee for vote */
290296
"Delegates.NotEnoughtTokensForVote" = "Nicht genug Tokens für die Abstimmung. Sie brauchen mindestens 50 ADM auf Ihrem Konto";

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>Doge.TransactionDetails.SendersFormat</key>
6+
<dict>
7+
<key>NSStringLocalizedFormatKey</key>
8+
<string>%#@senders@</string>
9+
<key>Variable</key>
10+
<dict>
11+
<key>NSStringFormatValueTypeKey</key>
12+
<string>d</string>
13+
<key>NSStringFormatSpecTypeKey</key>
14+
<string>NSStringPluralRuleType</string>
15+
<key>other</key>
16+
<string>%d Absender</string>
17+
<key>one</key>
18+
<string>%d Absender</string>
19+
</dict>
20+
</dict>
21+
<key>Doge.TransactionDetails.RecipientsFormat</key>
22+
<dict>
23+
<key>NSStringLocalizedFormatKey</key>
24+
<string>%#@recipients@</string>
25+
<key>recipients</key>
26+
<dict>
27+
<key>NSStringFormatSpecTypeKey</key>
28+
<string>NSStringPluralRuleType</string>
29+
<key>NSStringFormatValueTypeKey</key>
30+
<string>d</string>
31+
<key>other</key>
32+
<string>%d Empfänger</string>
33+
<key>one</key>
34+
<string>%d Empfänger</string>
35+
</dict>
36+
</dict>
537
<key>NotificationsService.NewMessage.BodyFormat</key>
638
<dict>
739
<key>NSStringLocalizedFormatKey</key>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,12 @@
127127
/* Account tab: 'Send ETH tokens' button */
128128
"AccountTab.Row.SendEth" = "Send ETH";
129129

130-
/* Account tab: 'Send ETH tokens' button */
130+
/* Account tab: 'Send LSK tokens' button */
131131
"AccountTab.Row.SendLsk" = "Send LSK";
132132

133+
/* Account tab: 'Send DOGE tokens' button */
134+
"AccountTab.Row.SendDoge" = "Send DOGE";
135+
133136
/* Account tab: Anonymously buy ADM tokens */
134137
"AccountTab.Row.AnonymouslyBuyADM" = "Buy ADM anonymously";
135138

@@ -169,6 +172,9 @@
169172
/* Account tab: Lisk wallet */
170173
"AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";
171174

175+
/* Account tab: Doge wallet */
176+
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";
177+
172178
/* Account page: scene title */
173179
"AccountTab.Title" = "Account";
174180

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>Doge.TransactionDetails.SendersFormat</key>
6+
<dict>
7+
<key>NSStringLocalizedFormatKey</key>
8+
<string>%#@senders@</string>
9+
<key>senders</key>
10+
<dict>
11+
<key>NSStringFormatValueTypeKey</key>
12+
<string>d</string>
13+
<key>NSStringFormatSpecTypeKey</key>
14+
<string>NSStringPluralRuleType</string>
15+
<key>other</key>
16+
<string>%d senders</string>
17+
<key>one</key>
18+
<string>%d sender</string>
19+
</dict>
20+
</dict>
21+
<key>Doge.TransactionDetails.RecipientsFormat</key>
22+
<dict>
23+
<key>NSStringLocalizedFormatKey</key>
24+
<string>%#@recipients@</string>
25+
<key>recipients</key>
26+
<dict>
27+
<key>NSStringFormatSpecTypeKey</key>
28+
<string>NSStringPluralRuleType</string>
29+
<key>NSStringFormatValueTypeKey</key>
30+
<string>d</string>
31+
<key>other</key>
32+
<string>%d recipients</string>
33+
<key>one</key>
34+
<string>%d recipient</string>
35+
</dict>
36+
</dict>
537
<key>NotificationsService.NewMessage.BodyFormat</key>
638
<dict>
739
<key>NSStringLocalizedFormatKey</key>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,12 @@
127127
/* Account tab: 'Send ETH tokens' button */
128128
"AccountTab.Row.SendEth" = "Отправить ETH";
129129

130-
/* Account tab: 'Send ETH tokens' button */
130+
/* Account tab: 'Send LSK tokens' button */
131131
"AccountTab.Row.SendLsk" = "Отправить LSK";
132132

133+
/* Account tab: 'Send DOGE tokens' button */
134+
"AccountTab.Row.SendDoge" = "Отправить DOGE";
135+
133136
/* Account tab: Anonymously buy ADM tokens */
134137
"AccountTab.Row.AnonymouslyBuyADM" = "Купить ADM анонимно";
135138

@@ -169,6 +172,9 @@
169172
/* Account tab: Lisk wallet */
170173
"AccountTab.Wallets.lisk_wallet" = "Кошелек Lisk";
171174

175+
/* Account tab: Doge wallet */
176+
"AccountTab.Wallets.doge_wallet" = "Кошелек Doge";
177+
172178
/* Account tab: Delegates section title */
173179
"AccountTab.Section.Delegates" = "Делегаты";
174180

‎Adamant/Assets/l18n/ru.lproj/Localizable.stringsdict

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,46 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>Doge.TransactionDetails.SendersFormat</key>
6+
<dict>
7+
<key>NSStringLocalizedFormatKey</key>
8+
<string>%#@senders@</string>
9+
<key>senders</key>
10+
<dict>
11+
<key>NSStringFormatValueTypeKey</key>
12+
<string>d</string>
13+
<key>NSStringFormatSpecTypeKey</key>
14+
<string>NSStringPluralRuleType</string>
15+
<key>other</key>
16+
<string>%d отправителя</string>
17+
<key>one</key>
18+
<string>%d отправитель</string>
19+
<key>few</key>
20+
<string>%d отправителя</string>
21+
<key>many</key>
22+
<string>%d отправителей</string>
23+
</dict>
24+
</dict>
25+
<key>Doge.TransactionDetails.RecipientsFormat</key>
26+
<dict>
27+
<key>NSStringLocalizedFormatKey</key>
28+
<string>%#@recipients@</string>
29+
<key>recipients</key>
30+
<dict>
31+
<key>NSStringFormatValueTypeKey</key>
32+
<string>d</string>
33+
<key>NSStringFormatSpecTypeKey</key>
34+
<string>NSStringPluralRuleType</string>
35+
<key>other</key>
36+
<string>%d получателя</string>
37+
<key>one</key>
38+
<string>%d получатель</string>
39+
<key>many</key>
40+
<string>%d получателей</string>
41+
<key>few</key>
42+
<string>%d получателя</string>
43+
</dict>
44+
</dict>
545
<key>NotificationsService.NewMessage.BodyFormat</key>
646
<dict>
747
<key>NSStringLocalizedFormatKey</key>

‎Adamant/CoreData/BaseTransaction+TransactionDetails.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import Foundation
1010

1111
extension BaseTransaction: TransactionDetails {
12+
static var defaultCurrencySymbol: String? { return AdmWalletService.currencySymbol }
13+
1214
var txId: String { return transactionId ?? "" }
1315
var senderAddress: String { return senderId ?? "" }
1416
var recipientAddress: String { return recipientId ?? "" }

‎Adamant/Helpers/Decimal+adamant.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import Foundation
1010

1111
extension Decimal {
1212
func shiftedFromAdamant() -> Decimal {
13-
return Decimal(sign: self.isSignMinus ? .minus : .plus, exponent: AdamantUtilities.currencyExponent, significand: self)
13+
return Decimal(sign: self.isSignMinus ? .minus : .plus, exponent: AdmWalletService.currencyExponent, significand: self)
1414
}
1515

1616
func shiftedToAdamant() -> Decimal {
17-
return Decimal(sign: self.isSignMinus ? .minus : .plus, exponent: -AdamantUtilities.currencyExponent, significand: self)
17+
return Decimal(sign: self.isSignMinus ? .minus : .plus, exponent: -AdmWalletService.currencyExponent, significand: self)
1818
}
1919

2020
var doubleValue: Double {

‎Adamant/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.4</string>
20+
<string>1.5</string>
2121
<key>CFBundleVersion</key>
22-
<string>69</string>
22+
<string>75</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSAppTransportSecurity</key>

0 commit comments

Comments
 (0)