diff --git a/Adamant-ios.xcodeproj/project.pbxproj b/Adamant-ios.xcodeproj/project.pbxproj index 2c8d84da5..0f88a8783 100644 --- a/Adamant-ios.xcodeproj/project.pbxproj +++ b/Adamant-ios.xcodeproj/project.pbxproj @@ -187,6 +187,7 @@ E91947B12000246A001362F8 /* AdamantError.swift */, E913C90A1FFFA965001A83F7 /* AdamantHash.swift */, E913C90C1FFFA99B001A83F7 /* Keypair.swift */, + E9E7CDB62003994E00DFC4DB /* AdamantFormatters.swift */, ); path = Helpers; sourceTree = ""; @@ -331,12 +332,14 @@ inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-Adamant-ios/Pods-Adamant-ios-frameworks.sh", "${BUILT_PRODUCTS_DIR}/Alamofire/Alamofire.framework", + "${BUILT_PRODUCTS_DIR}/FreakingSimpleRoundImageView/FreakingSimpleRoundImageView.framework", "${BUILT_PRODUCTS_DIR}/Swinject/Swinject.framework", "${BUILT_PRODUCTS_DIR}/SwinjectStoryboard/SwinjectStoryboard.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FreakingSimpleRoundImageView.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Swinject.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwinjectStoryboard.framework", ); @@ -388,6 +391,7 @@ E9E7CD8F20026CD300DFC4DB /* SwinjectedDialogService.swift in Sources */, E91947B020002393001362F8 /* AdamantApiService.swift in Sources */, E9E7CD8D20026B6600DFC4DB /* DialogService.swift in Sources */, + E9E7CDB72003994E00DFC4DB /* AdamantFormatters.swift in Sources */, E9E7CD9120026FA100DFC4DB /* SwinjectDependencies.swift in Sources */, E9E7CD8B20026B0600DFC4DB /* LoginService.swift in Sources */, E9E7CD932002740500DFC4DB /* AdamantLoginService.swift in Sources */, diff --git a/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png b/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png deleted file mode 100644 index 1726f07f6..000000000 Binary files a/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/adamant-logo-1024x1024.png and /dev/null differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Buttons/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Buttons/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/Contents.json new file mode 100644 index 000000000..f551a27bf --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "account.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "account@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "account@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account.png new file mode 100644 index 000000000..75c9c0293 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@2x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@2x.png new file mode 100644 index 000000000..645f9653e Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@2x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@3x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@3x.png new file mode 100644 index 000000000..3e3d4a8d8 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/account.imageset/account@3x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/Contents.json similarity index 73% rename from Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json rename to Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/Contents.json index c27d073bf..424b57a94 100644 --- a/Adamant-ios/Assets/Assets.xcassets/Adamant_Logo_big.imageset/Contents.json +++ b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/Contents.json @@ -2,15 +2,17 @@ "images" : [ { "idiom" : "universal", - "filename" : "adamant-logo-1024x1024.png", + "filename" : "send.png", "scale" : "1x" }, { "idiom" : "universal", + "filename" : "send@2x.png", "scale" : "2x" }, { "idiom" : "universal", + "filename" : "send@3x.png", "scale" : "3x" } ], diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send.png new file mode 100644 index 000000000..414e812f7 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@2x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@2x.png new file mode 100644 index 000000000..cce31a202 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@2x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@3x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@3x.png new file mode 100644 index 000000000..30271e95e Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/send.imageset/send@3x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/Contents.json new file mode 100644 index 000000000..b0f34699c --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "wallet.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "wallet@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "wallet@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet.png new file mode 100644 index 000000000..5a5d057d7 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@2x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@2x.png new file mode 100644 index 000000000..17cf3bea2 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@2x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@3x.png b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@3x.png new file mode 100644 index 000000000..c8e72da33 Binary files /dev/null and b/Adamant-ios/Assets/Assets.xcassets/Buttons/wallet.imageset/wallet@3x.png differ diff --git a/Adamant-ios/Assets/Assets.xcassets/Colors/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Colors/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Colors/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_main.colorset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_main.colorset/Contents.json new file mode 100644 index 000000000..2662ec4a6 --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_main.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0x4A", + "alpha" : "1.000", + "blue" : "0x4A", + "green" : "0x4A" + } + } + } + ] +} \ No newline at end of file diff --git a/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_secondary.colorset/Contents.json b/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_secondary.colorset/Contents.json new file mode 100644 index 000000000..411379953 --- /dev/null +++ b/Adamant-ios/Assets/Assets.xcassets/Colors/Gray_secondary.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + }, + "colors" : [ + { + "idiom" : "universal", + "color" : { + "color-space" : "srgb", + "components" : { + "red" : "0x7A", + "alpha" : "1.000", + "blue" : "0x7A", + "green" : "0x7A" + } + } + } + ] +} \ No newline at end of file diff --git a/Adamant-ios/Helpers/AdamantFormatters.swift b/Adamant-ios/Helpers/AdamantFormatters.swift new file mode 100644 index 000000000..e6ed7a5ce --- /dev/null +++ b/Adamant-ios/Helpers/AdamantFormatters.swift @@ -0,0 +1,20 @@ +// +// AdamantFormatters.swift +// Adamant-ios +// +// Created by Anokhov Pavel on 08.01.2018. +// Copyright © 2018 Adamant. All rights reserved. +// + +import Foundation + +class AdamantFormatters { + private static let balanceShift: Double = 100_000_000.0 + private static let currencyCode = "ADM" + + private init() { } + + static func format(balance: Int64) -> String { + return "\(Double(balance) / balanceShift) \(currencyCode)" + } +} diff --git a/Adamant-ios/Stories/Login/Login.storyboard b/Adamant-ios/Stories/Login/Login.storyboard index 61f2d1844..40dbf960c 100644 --- a/Adamant-ios/Stories/Login/Login.storyboard +++ b/Adamant-ios/Stories/Login/Login.storyboard @@ -84,5 +84,5 @@ - + diff --git a/Adamant.sublime-project b/Adamant.sublime-project new file mode 100644 index 000000000..24db30311 --- /dev/null +++ b/Adamant.sublime-project @@ -0,0 +1,8 @@ +{ + "folders": + [ + { + "path": "." + } + ] +} diff --git a/Podfile b/Podfile index 3a1f78bb7..691ff01f4 100644 --- a/Podfile +++ b/Podfile @@ -7,4 +7,7 @@ target 'Adamant-ios' do # Swinject DI pod 'Swinject' pod 'SwinjectStoryboard' + + # UI + pod 'FreakingSimpleRoundImageView' # Round avatars end diff --git a/Podfile.lock b/Podfile.lock index cda8138a0..4b12165d2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,19 +1,22 @@ PODS: - Alamofire (4.6.0) + - FreakingSimpleRoundImageView (1.0.0) - Swinject (2.1.1) - SwinjectStoryboard (1.1.2): - Swinject (~> 2.1) DEPENDENCIES: - Alamofire + - FreakingSimpleRoundImageView - Swinject - SwinjectStoryboard SPEC CHECKSUMS: Alamofire: f41a599bd63041760b26d393ec1069d9d7b917f4 + FreakingSimpleRoundImageView: aa7879307e21922d4a25923ef858539ec6ec8c05 Swinject: afea49fd95f392b41171669f165842879c48fad6 SwinjectStoryboard: 92e75763c3299cdf627bef98a5180dc894864336 -PODFILE CHECKSUM: 54427af31ed50318c61c8d4cf093ad1cbab368fd +PODFILE CHECKSUM: 9c5f942957a7a454171915dbb79a108a011d6d1b COCOAPODS: 1.3.1