Skip to content

Commit

Permalink
Merge branch 'release/1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
@RealBonus
RealBonus committed Apr 29, 2019
2 parents bf6d897 + d6e574d commit b35114e
Show file tree
Hide file tree
Showing 59 changed files with 2,690 additions and 280 deletions.
76 changes: 71 additions & 5 deletions Adamant.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions Adamant.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict/>
</plist>
6 changes: 6 additions & 0 deletions Adamant/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ struct AdamantResources {
static let lskServers = [
"https://lisknode1.adamant.im"
]

static let dogeServers: [URL] = [
URL(string: "https://dogenode1.adamant.im/api")!
]

// MARK: ADAMANT Addresses
static let supportEmail = "[email protected]"
Expand Down Expand Up @@ -85,6 +89,8 @@ struct AdamantResources {
static let liskExplorerAddress = "https://explorer.lisk.io/tx/"
// static let liskExplorerAddress = "https://testnet-explorer.lisk.io/tx/" // LISK Testnet

static let dogeExplorerAddress = "https://dogechain.info/tx/"

private init() {}
}

Expand Down
Binary file removed Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/wallet_lsk.png
View file
Binary file not shown.
Binary file removed Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/[email protected]
View file
Binary file not shown.
Binary file removed Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/[email protected]
View file
Binary file not shown.
23 changes: 23 additions & 0 deletions Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "wallet_doge.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/wallet_doge.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_doge.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/wallet_eth.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Adamant/Assets/Assets.xcassets/Wallets/wallet_eth.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...s/Icons/wallet_lsk.imageset/Contents.json → ...Wallets/wallet_lsk.imageset/Contents.json
View file
File renamed without changes.
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/wallet_lsk.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Adamant/Assets/Assets.xcassets/Wallets/wallet_lsk.imageset/[email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions Adamant/Assets/l18n/de.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,12 @@
/* Account tab: 'Send ETH tokens' button */
"AccountTab.Row.SendEth" = "ETH senden";

/* Account tab: 'Send ETH tokens' button */
/* Account tab: 'Send LSK tokens' button */
"AccountTab.Row.SendLsk" = "LSK senden";

/* Account tab: 'Send DOGE tokens' button */
"AccountTab.Row.SendDoge" = "DOGE senden";

/* Account tab: Anonymously buy ADM tokens */
"AccountTab.Row.AnonymouslyBuyADM" = "Kaufen Sie ADM anonym";

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

/* Account tab: 'Vote for delegates' button */
"AccountTab.Row.VoteForDelegates" = "Delegate wählen";
"AccountTab.Row.VoteForDelegates" = "Delegierte wählen";

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

/* Account tab: Doge wallet */
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";

/* Account page: scene title */
"AccountTab.Title" = "Konto";

/* Account tab: Delegates section title */
"AccountTab.Section.Delegates" = "Delegate";
"AccountTab.Section.Delegates" = "Delegierte";

/* Product name */
"ADAMANT" = "ADAMANT";
Expand Down Expand Up @@ -284,7 +290,7 @@
"ChatScene.Warning.UnsupportedUrl" = "Nicht unterstütztes URL-Protokoll";

/* Delegates page: scene title */
"Delegates.Title" = "Delegate";
"Delegates.Title" = "Delegierte";

/* Delegates tab: Message about 50 ADM fee for vote */
"Delegates.NotEnoughtTokensForVote" = "Nicht genug Tokens für die Abstimmung. Sie brauchen mindestens 50 ADM auf Ihrem Konto";
Expand Down
32 changes: 32 additions & 0 deletions Adamant/Assets/l18n/de.lproj/Localizable.stringsdict
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,38 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Doge.TransactionDetails.SendersFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@senders@</string>
<key>Variable</key>
<dict>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>other</key>
<string>%d Absender</string>
<key>one</key>
<string>%d Absender</string>
</dict>
</dict>
<key>Doge.TransactionDetails.RecipientsFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@recipients@</string>
<key>recipients</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>other</key>
<string>%d Empfänger</string>
<key>one</key>
<string>%d Empfänger</string>
</dict>
</dict>
<key>NotificationsService.NewMessage.BodyFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
Expand Down
8 changes: 7 additions & 1 deletion Adamant/Assets/l18n/en.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,12 @@
/* Account tab: 'Send ETH tokens' button */
"AccountTab.Row.SendEth" = "Send ETH";

/* Account tab: 'Send ETH tokens' button */
/* Account tab: 'Send LSK tokens' button */
"AccountTab.Row.SendLsk" = "Send LSK";

/* Account tab: 'Send DOGE tokens' button */
"AccountTab.Row.SendDoge" = "Send DOGE";

/* Account tab: Anonymously buy ADM tokens */
"AccountTab.Row.AnonymouslyBuyADM" = "Buy ADM anonymously";

Expand Down Expand Up @@ -169,6 +172,9 @@
/* Account tab: Lisk wallet */
"AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";

/* Account tab: Doge wallet */
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";

/* Account page: scene title */
"AccountTab.Title" = "Account";

Expand Down
32 changes: 32 additions & 0 deletions Adamant/Assets/l18n/en.lproj/Localizable.stringsdict
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,38 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Doge.TransactionDetails.SendersFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@senders@</string>
<key>senders</key>
<dict>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>other</key>
<string>%d senders</string>
<key>one</key>
<string>%d sender</string>
</dict>
</dict>
<key>Doge.TransactionDetails.RecipientsFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@recipients@</string>
<key>recipients</key>
<dict>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>other</key>
<string>%d recipients</string>
<key>one</key>
<string>%d recipient</string>
</dict>
</dict>
<key>NotificationsService.NewMessage.BodyFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
Expand Down
8 changes: 7 additions & 1 deletion Adamant/Assets/l18n/ru.lproj/Localizable.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,12 @@
/* Account tab: 'Send ETH tokens' button */
"AccountTab.Row.SendEth" = "Отправить ETH";

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

/* Account tab: 'Send DOGE tokens' button */
"AccountTab.Row.SendDoge" = "Отправить DOGE";

/* Account tab: Anonymously buy ADM tokens */
"AccountTab.Row.AnonymouslyBuyADM" = "Купить ADM анонимно";

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

/* Account tab: Doge wallet */
"AccountTab.Wallets.doge_wallet" = "Кошелек Doge";

/* Account tab: Delegates section title */
"AccountTab.Section.Delegates" = "Делегаты";

Expand Down
40 changes: 40 additions & 0 deletions Adamant/Assets/l18n/ru.lproj/Localizable.stringsdict
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,46 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Doge.TransactionDetails.SendersFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@senders@</string>
<key>senders</key>
<dict>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>other</key>
<string>%d отправителя</string>
<key>one</key>
<string>%d отправитель</string>
<key>few</key>
<string>%d отправителя</string>
<key>many</key>
<string>%d отправителей</string>
</dict>
</dict>
<key>Doge.TransactionDetails.RecipientsFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
<string>%#@recipients@</string>
<key>recipients</key>
<dict>
<key>NSStringFormatValueTypeKey</key>
<string>d</string>
<key>NSStringFormatSpecTypeKey</key>
<string>NSStringPluralRuleType</string>
<key>other</key>
<string>%d получателя</string>
<key>one</key>
<string>%d получатель</string>
<key>many</key>
<string>%d получателей</string>
<key>few</key>
<string>%d получателя</string>
</dict>
</dict>
<key>NotificationsService.NewMessage.BodyFormat</key>
<dict>
<key>NSStringLocalizedFormatKey</key>
Expand Down
2 changes: 2 additions & 0 deletions Adamant/CoreData/BaseTransaction+TransactionDetails.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import Foundation

extension BaseTransaction: TransactionDetails {
static var defaultCurrencySymbol: String? { return AdmWalletService.currencySymbol }

var txId: String { return transactionId ?? "" }
var senderAddress: String { return senderId ?? "" }
var recipientAddress: String { return recipientId ?? "" }
Expand Down
4 changes: 2 additions & 2 deletions Adamant/Helpers/Decimal+adamant.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import Foundation

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

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

var doubleValue: Double {
Expand Down
4 changes: 2 additions & 2 deletions Adamant/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4</string>
<string>1.5</string>
<key>CFBundleVersion</key>
<string>69</string>
<string>75</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
Expand Down
Loading

0 comments on commit b35114e

Please sign in to comment.