Skip to content

Commit

Permalink
Version 1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Woodehh committed Sep 27, 2017
1 parent 31de547 commit 6ba3cad
Show file tree
Hide file tree
Showing 79 changed files with 5,506 additions and 1,618 deletions.
276 changes: 276 additions & 0 deletions Artwork/Crypto logos/AI/bitcoin.ai

Large diffs are not rendered by default.

209 changes: 209 additions & 0 deletions Artwork/Crypto logos/AI/ethereum.ai

Large diffs are not rendered by default.

280 changes: 280 additions & 0 deletions Artwork/Crypto logos/AI/neo.ai

Large diffs are not rendered by default.

Binary file added Artwork/Crypto logos/PNG/bitcoin.png
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 Artwork/Crypto logos/PNG/ethereum.png
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 Artwork/Crypto logos/PNG/gas.png
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 Artwork/Crypto logos/PNG/neo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions Neodius.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
E22FEEC51F71091C000922C4 /* refreshIntervals.json in Resources */ = {isa = PBXBuildFile; fileRef = E22FEEC21F71091C000922C4 /* refreshIntervals.json */; };
E22FEED31F7109E2000922C4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E22FEED01F7109E2000922C4 /* Localizable.strings */; };
E25AB2AC1F7BC7E200CA1FF2 /* neodiusUIComponents.m in Sources */ = {isa = PBXBuildFile; fileRef = E25AB2AB1F7BC5BA00CA1FF2 /* neodiusUIComponents.m */; };
E25AB2AF1F7C01BF00CA1FF2 /* tipJarTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E25AB2AE1F7C01BF00CA1FF2 /* tipJarTableViewController.m */; };
E25AB2B11F7C05E300CA1FF2 /* donationData.json in Resources */ = {isa = PBXBuildFile; fileRef = E25AB2B01F7C038700CA1FF2 /* donationData.json */; };
E2AD85A11F6FED9A00D03087 /* Acknowledgements.plist in Resources */ = {isa = PBXBuildFile; fileRef = E2AD85A01F6FED9A00D03087 /* Acknowledgements.plist */; };
E2B3AE0D1F7A58CD00713798 /* marketViewCustomTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B3ADEC1F7A58AA00713798 /* marketViewCustomTableViewCell.m */; };
E2B3AE0E1F7A58CD00713798 /* NEOButton.m in Sources */ = {isa = PBXBuildFile; fileRef = E2B3ADEF1F7A58AA00713798 /* NEOButton.m */; };
Expand Down Expand Up @@ -45,6 +47,9 @@
E22FEED21F7109E2000922C4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
E25AB2AA1F7BC5BA00CA1FF2 /* neodiusUIComponents.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = neodiusUIComponents.h; sourceTree = "<group>"; };
E25AB2AB1F7BC5BA00CA1FF2 /* neodiusUIComponents.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = neodiusUIComponents.m; sourceTree = "<group>"; };
E25AB2AD1F7C01BF00CA1FF2 /* tipJarTableViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = tipJarTableViewController.h; path = tipjarTableViewController/tipJarTableViewController.h; sourceTree = "<group>"; };
E25AB2AE1F7C01BF00CA1FF2 /* tipJarTableViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = tipJarTableViewController.m; path = tipjarTableViewController/tipJarTableViewController.m; sourceTree = "<group>"; };
E25AB2B01F7C038700CA1FF2 /* donationData.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = donationData.json; path = "Neodius/Supporting Files/SettingCache/donationData.json"; sourceTree = SOURCE_ROOT; };
E2AD85A01F6FED9A00D03087 /* Acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Acknowledgements.plist; path = neodius/Acknowledgements.plist; sourceTree = SOURCE_ROOT; };
E2B3ADEB1F7A58AA00713798 /* marketViewCustomTableViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = marketViewCustomTableViewCell.h; sourceTree = "<group>"; };
E2B3ADEC1F7A58AA00713798 /* marketViewCustomTableViewCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = marketViewCustomTableViewCell.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,6 +125,7 @@
E22FEEBF1F71091C000922C4 /* SettingCache */ = {
isa = PBXGroup;
children = (
E25AB2B01F7C038700CA1FF2 /* donationData.json */,
E22FEEC01F71091C000922C4 /* cryptoCurrencies.json */,
E22FEEC11F71091C000922C4 /* fiatCurrencies.json */,
E22FEEC21F71091C000922C4 /* refreshIntervals.json */,
Expand Down Expand Up @@ -212,6 +218,8 @@
E2B3ADFD1F7A58AA00713798 /* MenuTableViewController */,
E2B3AE001F7A58AA00713798 /* Settings */,
E2B3AE0A1F7A58AA00713798 /* WalletViewTableViewController */,
E25AB2AD1F7C01BF00CA1FF2 /* tipJarTableViewController.h */,
E25AB2AE1F7C01BF00CA1FF2 /* tipJarTableViewController.m */,
);
name = ViewControllers;
path = Neodius/ViewControllers;
Expand Down Expand Up @@ -390,6 +398,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E25AB2B11F7C05E300CA1FF2 /* donationData.json in Resources */,
E2B3AE181F7A5BFB00713798 /* LaunchScreen.storyboard in Resources */,
E2B3AE171F7A590500713798 /* Assets.xcassets in Resources */,
E22FEEC31F71091C000922C4 /* cryptoCurrencies.json in Resources */,
Expand Down Expand Up @@ -490,6 +499,7 @@
E2B3AE101F7A58CD00713798 /* marketInfoTableViewController.m in Sources */,
E2B3AE111F7A58CD00713798 /* menuTableViewController.m in Sources */,
E2B3AE121F7A58CD00713798 /* selectionSettingsTableViewController.m in Sources */,
E25AB2AF1F7C01BF00CA1FF2 /* tipJarTableViewController.m in Sources */,
E2B3AE131F7A58CD00713798 /* settingsTableViewController.m in Sources */,
E2B3AE141F7A58CD00713798 /* walletManagementTableViewController.m in Sources */,
E2B3AE151F7A58CD00713798 /* walletViewTableViewController.m in Sources */,
Expand Down
61 changes: 61 additions & 0 deletions Neodius/Acknowledgements.plist
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,67 @@ THE SOFTWARE.</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>AsyncImageView
version 1.6, June 21st, 2016
Copyright (C) 2011 Charcoal Design
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.</string>
<key>License</key>
<string>zlib</string>
<key>Title</key>
<string>AsyncImageView</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>The MIT License (MIT)
Copyright (c) 2014 GraafICT
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.</string>
<key>License</key>
<string>MIT</string>
<key>Title</key>
<string>BDGShare</string>
<key>Type</key>
<string>PSGroupSpecifier</string>
</dict>
<dict>
<key>FooterText</key>
<string>The MIT License (MIT)
Expand Down
7 changes: 4 additions & 3 deletions Neodius/AppDelegate/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(


self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];


[[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil] setTintColor:[UIColor whiteColor]];

UIViewController *centerController = [[walletViewTableViewController alloc] initWithStyle:UITableViewStyleGrouped];
UIViewController *menuController = [[menuTableViewController alloc] initWithStyle:UITableViewStyleGrouped];
Expand All @@ -43,10 +44,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
[_window makeKeyAndVisible];

[LTHPasscodeViewController useKeychain:YES];
[LTHPasscodeViewController sharedUser].touchIDString = @"Enter use TouchID to unlock Neodius";
[LTHPasscodeViewController sharedUser].touchIDString = NSLocalizedString(@"Use TouchID to unlock Neodius", nil);
[LTHPasscodeViewController sharedUser].backgroundColor = [UIColor whiteColor];
[LTHPasscodeViewController sharedUser].backgroundImage = [UIImage imageNamed:@"menuLogo"];
[[LTHPasscodeViewController sharedUser] setLabelTextColor:neoGreenColor];
[LTHPasscodeViewController sharedUser].labelTextColor = neoGreenColor;
[LTHPasscodeViewController sharedUser].labelFont = [UIFont fontWithName:@"HelveticaNeue-Light" size:20];

if ([LTHPasscodeViewController doesPasscodeExist]) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "bitcoin.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ethereum.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Neodius/Assets/Assets.xcassets/donationGas.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "gas.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Neodius/Assets/Assets.xcassets/donationNeo.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "neo.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Neodius/Dependencies/NeodiusDataSource/neodiusDataSource.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
@property (NS_NONATOMIC_IOSONLY, getter=getFiatData, readonly, copy) NSDictionary *fiatData;
@property (NS_NONATOMIC_IOSONLY, getter=getCryptoData, readonly, copy) NSDictionary *cryptoData;
@property (NS_NONATOMIC_IOSONLY, getter=getIntervalData, readonly, copy) NSDictionary *intervalData;
@property (NS_NONATOMIC_IOSONLY, getter=getDonationData, readonly, copy) NSArray *donationData;

@property (NS_NONATOMIC_IOSONLY, getter=getBaseFiat, copy) NSString *baseFiat;
@property (NS_NONATOMIC_IOSONLY, getter=getBaseCrypto, copy) NSString *baseCrypto;
Expand Down
11 changes: 6 additions & 5 deletions Neodius/Dependencies/NeodiusDataSource/neodiusDataSource.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ -(NSDictionary*)getFiatData {
-(NSDictionary*)getIntervalData {
return [self loadCacheForJsonFile:@"refreshIntervals"];
}

//get refreshintervals
-(NSArray*)getDonationData {
return (NSArray*)[self loadCacheForJsonFile:@"donationData"];
}



Expand Down Expand Up @@ -264,10 +267,8 @@ -(NSString*)formatNumber:(NSNumber*)number ofType:(int)type withFiatSymbol:(NSSt


+ (id)allocWithZone:(NSZone *)zone {
@synchronized(self)
{
if (sharedData == nil)
{
@synchronized(self) {
if (sharedData == nil) {
sharedData = [super allocWithZone:zone];
return sharedData;
}
Expand Down
15 changes: 15 additions & 0 deletions Neodius/Dependencies/NeodiusUIComponents/neodiusUIComponents.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,32 @@
#import <UIKit/UIKit.h>
#import "UIAlertView+Blocks.h"
#import <QRCodeReaderViewController/QRCodeReaderViewController.h>
#import <KLCPopup/KLCPopup.h>
#import <QrcodeBuilder/QrcodeBuilder.h>
#import <CWStatusBarNotification/CWStatusBarNotification.h>
#import <BDGShare/BDGShare.h>
#import "NEOButton.h"
#import "neodiusDataSource.h"


@interface NeodiusUIComponents : NSObject <QRCodeReaderDelegate> {
QRCodeReaderViewController *vc;
NSString *tmpString,*tmpShareString;
UIImage *tmpImage;
UIViewController *tmpViewController;
KLCPopup *walletPopup;

}



+ (NeodiusUIComponents*)sharedComponents;


typedef void (^addNewWalletCompletionBlock)(bool addressEntered, NSString* walletName, NSString* walletAddress);
-(void)inputWalletInformationOnViewController:(UIViewController*)presentationView withAddressAndName:(BOOL)addressAndName WithCompletionBlock:(addNewWalletCompletionBlock)block;

-(void)showQrModalOnViewController:(UIViewController*)viewController withAddress:(NSString*)address withTitle:(NSString*)title andShareMessage:(NSString*)shareString;



Expand Down
Loading

0 comments on commit 6ba3cad

Please sign in to comment.