diff --git a/Neodius.xcodeproj/project.pbxproj b/Neodius.xcodeproj/project.pbxproj index 5001fd2..4273ef5 100644 --- a/Neodius.xcodeproj/project.pbxproj +++ b/Neodius.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 9876A2F2ECEC5C7D3617B8E3 /* libPods-Neodius.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 122C7CBC29ADBBDF249CA68D /* libPods-Neodius.a */; }; E22FEE911F7006C4000922C4 /* menuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22FEE831F7006C4000922C4 /* menuTableViewController.m */; }; E22FEE921F7006C4000922C4 /* selectionSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22FEE871F7006C4000922C4 /* selectionSettingsTableViewController.m */; }; E22FEE931F7006C4000922C4 /* settingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E22FEE8A1F7006C4000922C4 /* settingsTableViewController.m */; }; @@ -18,21 +19,20 @@ E22FEEC41F71091C000922C4 /* fiatCurrencies.json in Resources */ = {isa = PBXBuildFile; fileRef = E22FEEC11F71091C000922C4 /* fiatCurrencies.json */; }; E22FEEC51F71091C000922C4 /* refreshIntervals.json in Resources */ = {isa = PBXBuildFile; fileRef = E22FEEC21F71091C000922C4 /* refreshIntervals.json */; }; E22FEECD1F7109AA000922C4 /* NEOButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E22FEEC91F7109AA000922C4 /* NEOButton.m */; }; - E22FEECE1F7109AA000922C4 /* neodiusDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = E22FEECC1F7109AA000922C4 /* neodiusDataSource.m */; }; E22FEED31F7109E2000922C4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E22FEED01F7109E2000922C4 /* Localizable.strings */; }; - E26176C31F7667AD00DE6098 /* marketInfoTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E26176C21F7667AD00DE6098 /* marketInfoTableViewController.m */; }; E2AD85A11F6FED9A00D03087 /* Acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = E2AD85A01F6FED9A00D03087 /* Acknowledgements.plist */; }; + E2B3ADD11F77D4A700713798 /* marketInfoTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B3ADD01F77D3CC00713798 /* marketInfoTableViewController.m */; }; + E2B3ADE61F7A51AF00713798 /* marketViewCustomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B3ADE51F7A518400713798 /* marketViewCustomTableViewCell.m */; }; + E2B3ADE71F7A51B700713798 /* neodiusDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B3ADE21F7A50FB00713798 /* neodiusDataSource.m */; }; E2C20A8B1F6DCED700C2F8AB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C20A6E1F6DCED700C2F8AB /* AppDelegate.m */; }; - E2C20A8C1F6DCED700C2F8AB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E2C20A701F6DCED700C2F8AB /* Assets.xcassets */; }; E2C20A941F6DCED700C2F8AB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E2C20A7D1F6DCED700C2F8AB /* main.m */; }; E2C20A9A1F6DDF5C00C2F8AB /* LocalAuthentication.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2C20A991F6DDF5C00C2F8AB /* LocalAuthentication.framework */; }; - ED30859781AE9E136D7C7CB8 /* libPods-Neodius.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E8A89C7184B03B999346CB0 /* libPods-Neodius.a */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 122C7CBC29ADBBDF249CA68D /* libPods-Neodius.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Neodius.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3A106154801C575D9B4B9A94 /* Pods-neodius.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-neodius.debug.xcconfig"; path = "Pods/Target Support Files/Pods-neodius/Pods-neodius.debug.xcconfig"; sourceTree = ""; }; 502D902AA73201C39B38338B /* Pods-Neodius.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Neodius.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Neodius/Pods-Neodius.debug.xcconfig"; sourceTree = ""; }; - 7E8A89C7184B03B999346CB0 /* libPods-Neodius.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Neodius.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 8382A969674BAE6B3F96E96F /* Pods-Neodius.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Neodius.release.xcconfig"; path = "Pods/Target Support Files/Pods-Neodius/Pods-Neodius.release.xcconfig"; sourceTree = ""; }; ABF317706F0129D456A7E0AB /* Pods-neodius.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-neodius.release.xcconfig"; path = "Pods/Target Support Files/Pods-neodius/Pods-neodius.release.xcconfig"; sourceTree = ""; }; E22FEE821F7006C4000922C4 /* menuTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = menuTableViewController.h; sourceTree = ""; }; @@ -52,18 +52,20 @@ E22FEEC21F71091C000922C4 /* refreshIntervals.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = refreshIntervals.json; sourceTree = ""; }; E22FEEC81F7109AA000922C4 /* NEOButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NEOButton.h; sourceTree = ""; }; E22FEEC91F7109AA000922C4 /* NEOButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NEOButton.m; sourceTree = ""; }; - E22FEECB1F7109AA000922C4 /* neodiusDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = neodiusDataSource.h; sourceTree = ""; }; - E22FEECC1F7109AA000922C4 /* neodiusDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = neodiusDataSource.m; sourceTree = ""; }; E22FEED11F7109E2000922C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; E22FEED21F7109E2000922C4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = ""; }; - E26176C11F7667AD00DE6098 /* marketInfoTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = marketInfoTableViewController.h; path = "neodius/ViewControllers/New Group/marketInfoTableViewController.h"; sourceTree = SOURCE_ROOT; }; - E26176C21F7667AD00DE6098 /* marketInfoTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = marketInfoTableViewController.m; path = "neodius/ViewControllers/New Group/marketInfoTableViewController.m"; sourceTree = SOURCE_ROOT; }; E2AD85A01F6FED9A00D03087 /* Acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Acknowledgements.plist; path = neodius/Acknowledgements.plist; sourceTree = SOURCE_ROOT; }; + E2B3ADCF1F77D3CC00713798 /* marketInfoTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = marketInfoTableViewController.h; sourceTree = ""; }; + E2B3ADD01F77D3CC00713798 /* marketInfoTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = marketInfoTableViewController.m; sourceTree = ""; }; + E2B3ADDB1F79BB7500713798 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Neodius/Assets/Assets.xcassets; sourceTree = SOURCE_ROOT; }; + E2B3ADE11F7A50FB00713798 /* neodiusDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = neodiusDataSource.h; sourceTree = ""; }; + E2B3ADE21F7A50FB00713798 /* neodiusDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = neodiusDataSource.m; sourceTree = ""; }; + E2B3ADE41F7A518400713798 /* marketViewCustomTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = marketViewCustomTableViewCell.h; sourceTree = ""; }; + E2B3ADE51F7A518400713798 /* marketViewCustomTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = marketViewCustomTableViewCell.m; sourceTree = ""; }; E2C20A031F6D094500C2F8AB /* Neodius.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Neodius.app; sourceTree = BUILT_PRODUCTS_DIR; }; E2C20A381F6DBE7700C2F8AB /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; E2C20A6D1F6DCED700C2F8AB /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; E2C20A6E1F6DCED700C2F8AB /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; - E2C20A701F6DCED700C2F8AB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; E2C20A7D1F6DCED700C2F8AB /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; E2C20A991F6DDF5C00C2F8AB /* LocalAuthentication.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LocalAuthentication.framework; path = System/Library/Frameworks/LocalAuthentication.framework; sourceTree = SDKROOT; }; F4DCA91E818B7B19BC8331F1 /* libPods-neodius.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-neodius.a"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -75,7 +77,7 @@ buildActionMask = 2147483647; files = ( E2C20A9A1F6DDF5C00C2F8AB /* LocalAuthentication.framework in Frameworks */, - ED30859781AE9E136D7C7CB8 /* libPods-Neodius.a in Frameworks */, + 9876A2F2ECEC5C7D3617B8E3 /* libPods-Neodius.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -98,7 +100,7 @@ children = ( E2C20A991F6DDF5C00C2F8AB /* LocalAuthentication.framework */, F4DCA91E818B7B19BC8331F1 /* libPods-neodius.a */, - 7E8A89C7184B03B999346CB0 /* libPods-Neodius.a */, + 122C7CBC29ADBBDF249CA68D /* libPods-Neodius.a */, ); name = Frameworks; sourceTree = ""; @@ -109,7 +111,7 @@ E22FEE8E1F7006C4000922C4 /* WalletViewTableViewController */, E22FEE811F7006C4000922C4 /* MenuTableViewController */, E22FEE841F7006C4000922C4 /* SettingsControllers */, - E26176C51F7667BD00DE6098 /* MarketInfoTableViewController */, + E2B3ADCE1F77D3CC00713798 /* MarketInfoTableViewController */, ); path = ViewControllers; sourceTree = ""; @@ -191,8 +193,9 @@ E22FEEC61F7109AA000922C4 /* Dependencies */ = { isa = PBXGroup; children = ( + E2B3ADE31F7A518400713798 /* marketViewCustomTableViewCell */, + E2B3ADE01F7A50FB00713798 /* NeodiusDataSource */, E22FEEC71F7109AA000922C4 /* NEOButton */, - E22FEECA1F7109AA000922C4 /* NeodiusDataSource */, ); path = Dependencies; sourceTree = ""; @@ -206,15 +209,6 @@ path = NEOButton; sourceTree = ""; }; - E22FEECA1F7109AA000922C4 /* NeodiusDataSource */ = { - isa = PBXGroup; - children = ( - E22FEECB1F7109AA000922C4 /* neodiusDataSource.h */, - E22FEECC1F7109AA000922C4 /* neodiusDataSource.m */, - ); - path = NeodiusDataSource; - sourceTree = ""; - }; E22FEECF1F7109E2000922C4 /* LocalizedData */ = { isa = PBXGroup; children = ( @@ -224,15 +218,35 @@ path = "neodius/Supporting Files/LocalizedData"; sourceTree = SOURCE_ROOT; }; - E26176C51F7667BD00DE6098 /* MarketInfoTableViewController */ = { + E2B3ADCE1F77D3CC00713798 /* MarketInfoTableViewController */ = { isa = PBXGroup; children = ( - E26176C11F7667AD00DE6098 /* marketInfoTableViewController.h */, - E26176C21F7667AD00DE6098 /* marketInfoTableViewController.m */, + E2B3ADCF1F77D3CC00713798 /* marketInfoTableViewController.h */, + E2B3ADD01F77D3CC00713798 /* marketInfoTableViewController.m */, ); name = MarketInfoTableViewController; - path = "New Group"; - sourceTree = ""; + path = neodius/ViewControllers/MarketInfoTableViewController; + sourceTree = SOURCE_ROOT; + }; + E2B3ADE01F7A50FB00713798 /* NeodiusDataSource */ = { + isa = PBXGroup; + children = ( + E2B3ADE11F7A50FB00713798 /* neodiusDataSource.h */, + E2B3ADE21F7A50FB00713798 /* neodiusDataSource.m */, + ); + name = NeodiusDataSource; + path = Neodius/Dependencies/NeodiusDataSource; + sourceTree = SOURCE_ROOT; + }; + E2B3ADE31F7A518400713798 /* marketViewCustomTableViewCell */ = { + isa = PBXGroup; + children = ( + E2B3ADE41F7A518400713798 /* marketViewCustomTableViewCell.h */, + E2B3ADE51F7A518400713798 /* marketViewCustomTableViewCell.m */, + ); + name = marketViewCustomTableViewCell; + path = neodius/Dependencies/marketViewCustomTableViewCell; + sourceTree = SOURCE_ROOT; }; E2C209FA1F6D094500C2F8AB = { isa = PBXGroup; @@ -279,8 +293,8 @@ E2C20A6F1F6DCED700C2F8AB /* Assets */ = { isa = PBXGroup; children = ( + E2B3ADDB1F79BB7500713798 /* Assets.xcassets */, E22FEEBD1F7108FC000922C4 /* LaunchScreen.storyboard */, - E2C20A701F6DCED700C2F8AB /* Assets.xcassets */, ); path = Assets; sourceTree = ""; @@ -367,7 +381,6 @@ E22FEEA31F70F9C1000922C4 /* FontAwesome4.ttf in Resources */, E22FEED31F7109E2000922C4 /* Localizable.strings in Resources */, E22FEEC51F71091C000922C4 /* refreshIntervals.json in Resources */, - E2C20A8C1F6DCED700C2F8AB /* Assets.xcassets in Resources */, E2AD85A11F6FED9A00D03087 /* Acknowledgements.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -453,8 +466,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E2B3ADE71F7A51B700713798 /* neodiusDataSource.m in Sources */, + E2B3ADE61F7A51AF00713798 /* marketViewCustomTableViewCell.m in Sources */, + E2B3ADD11F77D4A700713798 /* marketInfoTableViewController.m in Sources */, E22FEE911F7006C4000922C4 /* menuTableViewController.m in Sources */, - E22FEECE1F7109AA000922C4 /* neodiusDataSource.m in Sources */, E22FEE931F7006C4000922C4 /* settingsTableViewController.m in Sources */, E2C20A941F6DCED700C2F8AB /* main.m in Sources */, E22FEE941F7006C4000922C4 /* walletManagementTableViewController.m in Sources */, @@ -462,7 +477,6 @@ E22FEE951F7006C4000922C4 /* walletViewTableViewController.m in Sources */, E22FEE921F7006C4000922C4 /* selectionSettingsTableViewController.m in Sources */, E2C20A8B1F6DCED700C2F8AB /* AppDelegate.m in Sources */, - E26176C31F7667AD00DE6098 /* marketInfoTableViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Neodius/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json b/Neodius/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json index 28c80e1..d225b3c 100644 --- a/Neodius/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Neodius/Assets/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -107,6 +107,11 @@ "idiom" : "ipad", "filename" : "Icon-App-83.5x83.5@2x.png", "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" } ], "info" : { diff --git a/Neodius/Assets/LaunchScreen.storyboard b/Neodius/Assets/LaunchScreen.storyboard index 6a8493c..1aa367d 100644 --- a/Neodius/Assets/LaunchScreen.storyboard +++ b/Neodius/Assets/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + diff --git a/Neodius/Info.plist b/Neodius/Info.plist index 091cfea..a9701a3 100644 --- a/Neodius/Info.plist +++ b/Neodius/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 1.1 CFBundleVersion - 547 + 846 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/Podfile b/Podfile index 42cf10a..d621835 100644 --- a/Podfile +++ b/Podfile @@ -1,5 +1,6 @@ project 'Neodius.xcodeproj' platform :ios, '8.0' +#use_frameworks! target 'Neodius' do #Git pods diff --git a/Podfile.lock b/Podfile.lock index bae5ed7..f696123 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -83,6 +83,6 @@ SPEC CHECKSUMS: ViewDeck: 942d90dd23c9f97cc8038be352255378167edcca YCFirstTime: 7daef261357bd74b4badd85113e2adb309d69900 -PODFILE CHECKSUM: 10f5456bdf69e8db1adccec6af32bbec952bdfcb +PODFILE CHECKSUM: 182b36bf6679adf2b132c21143285845cf9ca68b COCOAPODS: 1.2.0 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index bae5ed7..f696123 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -83,6 +83,6 @@ SPEC CHECKSUMS: ViewDeck: 942d90dd23c9f97cc8038be352255378167edcca YCFirstTime: 7daef261357bd74b4badd85113e2adb309d69900 -PODFILE CHECKSUM: 10f5456bdf69e8db1adccec6af32bbec952bdfcb +PODFILE CHECKSUM: 182b36bf6679adf2b132c21143285845cf9ca68b COCOAPODS: 1.2.0