Commit 403e3b78 by Daniel Dahan

Merge pull request #254 from gilthonweapps/FixBundle

Nicely done. I will test this in development. :) This will be part of today's release.
parents 0303208c 1f472102
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_add_white_2x.png",
"filename" : "ic_add_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_add_white_3x.png",
"filename" : "ic_add_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_arrow_back_white_2x.png",
"filename" : "ic_arrow_back_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_back_white_3x.png",
"filename" : "ic_arrow_back_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_arrow_downward_white_2x.png",
"filename" : "ic_arrow_downward_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_arrow_downward_white_3x.png",
"filename" : "ic_arrow_downward_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_close_white_2x.png",
"filename" : "ic_close_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_close_white_3x.png",
"filename" : "ic_close_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_menu_white_2x.png",
"filename" : "ic_menu_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_menu_white_3x.png",
"filename" : "ic_menu_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_more_horiz_white_2x.png",
"filename" : "ic_more_horiz_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_more_horiz_white_3x.png",
"filename" : "ic_more_horiz_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_more_vert_white_2x.png",
"filename" : "ic_more_vert_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_more_vert_white_3x.png",
"filename" : "ic_more_vert_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_search_white_2x.png",
"filename" : "ic_search_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_search_white_3x.png",
"filename" : "ic_search_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -7,12 +7,12 @@
},
{
"idiom" : "universal",
"filename" : "ic_share_white_2x.png",
"filename" : "ic_share_white@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_share_white_3x.png",
"filename" : "ic_share_white@3x.png",
"scale" : "3x"
}
],
......
......@@ -31,14 +31,16 @@
import UIKit
public struct MaterialIcon {
public static let add: UIImage? = UIImage(named: "ic_add_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let arrowBack: UIImage? = UIImage(named: "ic_arrow_back_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let arrowDownward: UIImage? = UIImage(named: "ic_arrow_downward_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let clear: UIImage? = UIImage(named: "ic_close_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let close: UIImage? = UIImage(named: "ic_close_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let menu: UIImage? = UIImage(named: "ic_menu_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let moreHorizontal: UIImage? = UIImage(named: "ic_more_horiz_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let moreVertical: UIImage? = UIImage(named: "ic_more_vert_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let search: UIImage? = UIImage(named: "ic_search_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let share: UIImage? = UIImage(named: "ic_share_white", inBundle: NSBundle(identifier: "io.cosmicmind.Material"), compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
private static let bundle = NSBundle(URL: NSBundle(forClass: MaterialView.self).resourceURL!.URLByAppendingPathComponent("io.cosmicmind.Material.bundle"))!
public static let add: UIImage? = UIImage(named: "ic_add_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let arrowBack: UIImage? = UIImage(named: "ic_arrow_back_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let arrowDownward: UIImage? = UIImage(named: "ic_arrow_downward_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let clear: UIImage? = UIImage(named: "ic_close_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let close: UIImage? = UIImage(named: "ic_close_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let menu: UIImage? = UIImage(named: "ic_menu_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let moreHorizontal: UIImage? = UIImage(named: "ic_more_horiz_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let moreVertical: UIImage? = UIImage(named: "ic_more_vert_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let search: UIImage? = UIImage(named: "ic_search_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
public static let share: UIImage? = UIImage(named: "ic_share_white", inBundle: bundle, compatibleWithTraitCollection: nil)?.imageWithRenderingMode(.AlwaysTemplate)
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment