Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dead fellaz #128

Merged
merged 7 commits into from
Aug 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NFTY.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1032,7 +1032,7 @@
CODE_SIGN_ENTITLEMENTS = NFTY/NFTY.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "NFTY/Preview\\ Content";
DEVELOPMENT_TEAM = C28QWE5379;
ENABLE_PREVIEWS = YES;
Expand All @@ -1059,7 +1059,7 @@
CODE_SIGN_ENTITLEMENTS = NFTY/NFTY.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "NFTY/Preview\\ Content";
DEVELOPMENT_TEAM = C28QWE5379;
ENABLE_PREVIEWS = YES;
Expand Down
21 changes: 21 additions & 0 deletions NFTY/Assets.xcassets/DEAD_FELLAZ1.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "DEAD_FELLAZ1.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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 NFTY/Assets.xcassets/DEAD_FELLAZ2.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "DEAD_FELLAZ2.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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 NFTY/Assets.xcassets/DEAD_FELLAZ3.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "DEAD_FELLAZ3.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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 NFTY/Assets.xcassets/DEAD_FELLAZ4.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "DEAD_FELLAZ4.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions NFTY/Model/NFT.swift
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,13 @@ let SAMPLE_COOL_CATS : [String] = [
"COOL_CATS4"
]

let SAMPLE_DEAD_FELLAZ : [String] = [
"DEAD_FELLAZ1",
"DEAD_FELLAZ2",
"DEAD_FELLAZ3",
"DEAD_FELLAZ4"
]

let CryptoPunks_nearestTokens : [[UInt]] = load("CryptoPunks_nearestTokens.json")
let CryptoPunks_rarityRanks : [UInt] = load("CryptoPunks_rarityRanks.json")

Expand Down
2 changes: 1 addition & 1 deletion NFTY/Model/TokenContracts.swift
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ var wethFetcher = WETHFetcher()


var web3 = Web3(rpcURL: "https://mainnet.infura.io/v3/b4287cfd0a6b4849bd0ca79e144d3921")
var INIT_BLOCK = BigUInt(12850064 - (Date.from(year:2021,month:7,day:18)!.timeIntervalSinceNow / 15))
var INIT_BLOCK = BigUInt(13021631 - (Date.from(year:2021,month:8,day:14)!.timeIntervalSinceNow / 15))

protocol TokenEventsFetcher {
func getEvents(onDone: @escaping () -> Void,_ response: @escaping (TradeEvent) -> Void)
Expand Down
21 changes: 20 additions & 1 deletion NFTY/ViewModel/CoreCollections.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ let CCB_Contract = UrlCollectionContract(name: "NFTokers", address: "0x80a4B80C6

let Birdhouse_Contract = UrlCollectionContract(name: "TheBirdHouse", address: "0x149915F1FD17fe5899ADac2542Be90690eD8A526", baseUri: "https://tbh-data.s3.amazonaws.com/final/images/")


let CYPHER_CITY_Contract = IpfsCollectionContract(
name: "Cypher City",
address: "0x00C396383400a1EF2eB401052dBF5d989B2da481")

let CoolCats_Contract = IpfsCollectionContract(name: "CoolCats",address: "0x1A92f7381B9F03921564a437210bB9396471050C")

let DeadFellaz_Contract = IpfsCollectionContract(name: "DeadFellaz",address: "0x2acAb3DEa77832C09420663b0E1cB386031bA17B")

let CompositeCollection = CompositeRecentTradesObject([
CompositeRecentTradesObject.CollectionInitializer(
Expand Down Expand Up @@ -214,6 +214,25 @@ let CompositeCollection = CompositeRecentTradesObject([
),
contract:CoolCats_Contract),

CompositeRecentTradesObject.CollectionInitializer(
info:CollectionInfo(
address:DeadFellaz_Contract.contractAddressHex,
url1:SAMPLE_DEAD_FELLAZ[0],
url2:SAMPLE_DEAD_FELLAZ[1],
url3:SAMPLE_DEAD_FELLAZ[2],
url4:SAMPLE_DEAD_FELLAZ[3],
name:DeadFellaz_Contract.name,
webLink: URL(string:"https://www.deadfellaz.io")!,
themeColor:Color.black,
themeLabelColor:Color.white,
subThemeColor:Color.label,
collectionColor:Color.black,
disableRecentTrades:false,
similarTokens : nil,//SimilarTokensGetter(label:"NFTokers") { tokenId in CCD_nearestTokens[safe:Int(tokenId)] },
rarityRanking : nil//RarityRankingImpl(CCD_rarityRanks)
),
contract:DeadFellaz_Contract),

CompositeRecentTradesObject.CollectionInitializer(
info:CollectionInfo(
address:Birdhouse_Contract.contractAddressHex,
Expand Down
6 changes: 3 additions & 3 deletions NFTY/Views/FeedView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ struct FeedView: View {
LazyVStack {
let sampleInfos = [
CompositeCollection.collections[0].info,
CompositeCollection.collections[1].info,
CompositeCollection.collections[2].info,
CompositeCollection.collections[0].info
CompositeCollection.collections[3].info,
CompositeCollection.collections[4].info,
CompositeCollection.collections[5].info
]

ForEach(sampleInfos.indices,id:\.self) { index in
Expand Down