Skip to content

M
Material
Commit 0baa6327 by Daniel Dahan
Options

updated icons in MaterialIcon

parent 97be9f09
Showing with 40 additions and 127 deletions
Examples/Programmatic/App/App.xcodeproj/project.pbxproj
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
9663F94E1C7A74EA00AF0965 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */; }; 9663F94E1C7A74EA00AF0965 /* AppLeftViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */; };
9663F9521C7A751D00AF0965 /* ItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9511C7A751D00AF0965 /* ItemViewController.swift */; }; 9663F9521C7A751D00AF0965 /* ItemViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9663F9511C7A751D00AF0965 /* ItemViewController.swift */; };
96CC08881C7FEBD60034FF84 /* RecipesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */; }; 96CC08881C7FEBD60034FF84 /* RecipesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */; };
96E01F7A1CACB0DF00411B61 /* Material.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 96E01F791CACB0DF00411B61 /* Material.framework */; };
96E01F7B1CACB0DF00411B61 /* Material.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 96E01F791CACB0DF00411B61 /* Material.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */ /* Begin PBXCopyFilesBuildPhase section */
...@@ -28,6 +30,7 @@ ...@@ -28,6 +30,7 @@
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
96E01F7B1CACB0DF00411B61 /* Material.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -49,6 +52,7 @@ ...@@ -49,6 +52,7 @@
9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; }; 9663F94D1C7A74EA00AF0965 /* AppLeftViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppLeftViewController.swift; sourceTree = "<group>"; };
9663F9511C7A751D00AF0965 /* ItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemViewController.swift; sourceTree = "<group>"; }; 9663F9511C7A751D00AF0965 /* ItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemViewController.swift; sourceTree = "<group>"; };
96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecipesViewController.swift; sourceTree = "<group>"; }; 96CC08871C7FEBD60034FF84 /* RecipesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecipesViewController.swift; sourceTree = "<group>"; };
96E01F791CACB0DF00411B61 /* Material.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; name = Material.framework; path = "/Users/danieldahan/Library/Developer/Xcode/DerivedData/Material-hbpnflxhoouqxebjcyhbbhqyesjd/Build/Products/Debug-iphoneos/Material.framework"; sourceTree = "<absolute>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
...@@ -56,6 +60,7 @@ ...@@ -56,6 +60,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
96E01F7A1CACB0DF00411B61 /* Material.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
...@@ -65,6 +70,7 @@ ...@@ -65,6 +70,7 @@
9663F9251C7A744500AF0965 = { 9663F9251C7A744500AF0965 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
96E01F791CACB0DF00411B61 /* Material.framework */,
9663F9301C7A744600AF0965 /* App */, 9663F9301C7A744600AF0965 /* App */,
9663F92F1C7A744600AF0965 /* Products */, 9663F92F1C7A744600AF0965 /* Products */,
); );
......
Examples/Programmatic/App/App/AppMenuViewController.swift
...@@ -118,24 +118,27 @@ class AppMenuViewController: MenuViewController { ...@@ -118,24 +118,27 @@ class AppMenuViewController: MenuViewController {
menuButton.addTarget(self, action: #selector(handleMenu), forControlEvents: .TouchUpInside) menuButton.addTarget(self, action: #selector(handleMenu), forControlEvents: .TouchUpInside)
menuView.addSubview(menuButton) menuView.addSubview(menuButton)
image = UIImage(named: "ic_create_white") image = MaterialIcon.pen
let blueButton: FabButton = FabButton() let blueButton: FabButton = FabButton()
blueButton.tintColor = MaterialColor.white
blueButton.backgroundColor = MaterialColor.blue.base blueButton.backgroundColor = MaterialColor.blue.base
blueButton.setImage(image, forState: .Normal) blueButton.setImage(image, forState: .Normal)
blueButton.setImage(image, forState: .Highlighted) blueButton.setImage(image, forState: .Highlighted)
menuView.addSubview(blueButton) menuView.addSubview(blueButton)
blueButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside) blueButton.addTarget(self, action: #selector(handleBlueButton), forControlEvents: .TouchUpInside)
image = UIImage(named: "ic_photo_camera_white") image = MaterialIcon.photoCamera
let greenButton: FabButton = FabButton() let greenButton: FabButton = FabButton()
greenButton.tintColor = MaterialColor.white
greenButton.backgroundColor = MaterialColor.green.base greenButton.backgroundColor = MaterialColor.green.base
greenButton.setImage(image, forState: .Normal) greenButton.setImage(image, forState: .Normal)
greenButton.setImage(image, forState: .Highlighted) greenButton.setImage(image, forState: .Highlighted)
menuView.addSubview(greenButton) menuView.addSubview(greenButton)
greenButton.addTarget(self, action: #selector(handleGreenButton), forControlEvents: .TouchUpInside) greenButton.addTarget(self, action: #selector(handleGreenButton), forControlEvents: .TouchUpInside)
image = UIImage(named: "ic_note_add_white") image = MaterialIcon.star
let yellowButton: FabButton = FabButton() let yellowButton: FabButton = FabButton()
yellowButton.tintColor = MaterialColor.white
yellowButton.backgroundColor = MaterialColor.yellow.base yellowButton.backgroundColor = MaterialColor.yellow.base
yellowButton.setImage(image, forState: .Normal) yellowButton.setImage(image, forState: .Normal)
yellowButton.setImage(image, forState: .Highlighted) yellowButton.setImage(image, forState: .Highlighted)
......
Examples/Programmatic/App/App/Assets.xcassets/ic_photo_camera_white.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white_2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white_3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/App/App/Assets.xcassets/ic_photo_camera_white_36pt.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white_36pt.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white_36pt@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_photo_camera_white_36pt@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/App/App/Assets.xcassets/ic_share_white_18pt.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_share_white_18pt.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_share_white_18pt_2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_share_white_18pt_3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Examples/Programmatic/App/App/Assets.xcassets/ic_videocam_white_36pt.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"filename" : "ic_videocam_white_36pt.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "ic_videocam_white_36pt@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "ic_videocam_white_36pt@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
Sources/Assets.xcassets/ic_add_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_add_white@2x.png", "filename" : "ic_add_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_add_white@3x.png", "filename" : "ic_add_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png
Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png

88 Bytes | W: | H:

Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png

198 Bytes | W: | H:

Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png
Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png
Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png
Sources/Assets.xcassets/ic_add_white.imageset/ic_add_white.png
  • 2-up
  • Swipe
  • Onion skin
Sources/Assets.xcassets/ic_arrow_back_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_arrow_back_white@2x.png", "filename" : "ic_arrow_back_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_arrow_back_white@3x.png", "filename" : "ic_arrow_back_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_arrow_downward_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_arrow_downward_white@2x.png", "filename" : "ic_arrow_downward_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_arrow_downward_white@3x.png", "filename" : "ic_arrow_downward_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Examples/Programmatic/App/App/Assets.xcassets/ic_camera_front_white.imageset/Contents.json → Sources/Assets.xcassets/ic_audio_white.imageset/Contents.json
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_front_white.png", "filename" : "ic_audio_white.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_front_white@2x.png", "filename" : "ic_audio_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_front_white@3x.png", "filename" : "ic_audio_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Examples/Programmatic/App/App/Assets.xcassets/ic_camera_rear_white.imageset/Contents.json → Sources/Assets.xcassets/ic_bell_white.imageset/Contents.json
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_rear_white.png", "filename" : "ic_bell_white.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_rear_white@2x.png", "filename" : "ic_bell_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_camera_rear_white@3x.png", "filename" : "ic_bell_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_close_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_close_white@2x.png", "filename" : "ic_close_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_close_white@3x.png", "filename" : "ic_close_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png
Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png

175 Bytes | W: | H:

Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png

247 Bytes | W: | H:

Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png
Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png
Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png
Sources/Assets.xcassets/ic_close_white.imageset/ic_close_white.png
  • 2-up
  • Swipe
  • Onion skin
Examples/Programmatic/App/App/Assets.xcassets/ic_create_white.imageset/Contents.json → Sources/Assets.xcassets/ic_image_white.imageset/Contents.json
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_create_white.png", "filename" : "ic_image_white.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_create_white_2x.png", "filename" : "ic_image_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_create_white_3x.png", "filename" : "ic_image_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_menu_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_menu_white@2x.png", "filename" : "ic_menu_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_menu_white@3x.png", "filename" : "ic_menu_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png
Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png

83 Bytes | W: | H:

Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png

175 Bytes | W: | H:

Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png
Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png
Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png
Sources/Assets.xcassets/ic_menu_white.imageset/ic_menu_white.png
  • 2-up
  • Swipe
  • Onion skin
Sources/Assets.xcassets/ic_more_horiz_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_more_horiz_white@2x.png", "filename" : "ic_more_horiz_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_more_horiz_white@3x.png", "filename" : "ic_more_horiz_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_more_vert_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_more_vert_white@2x.png", "filename" : "ic_more_vert_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_more_vert_white@3x.png", "filename" : "ic_more_vert_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Examples/Programmatic/App/App/Assets.xcassets/ic_flash_auto_white.imageset/Contents.json → Sources/Assets.xcassets/ic_pen_white.imageset/Contents.json
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
"images" : [ "images" : [
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_flash_auto_white.png", "filename" : "ic_pen_white.png",
"scale" : "1x" "scale" : "1x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_flash_auto_white@2x.png", "filename" : "ic_pen_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_flash_auto_white@3x.png", "filename" : "ic_pen_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
Sources/Assets.xcassets/ic_photo_camera_white.imageset/Contents.json
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_photo_camera_white@2x.png", "filename" : "ic_photo_camera_white_2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"idiom" : "universal", "idiom" : "universal",
"filename" : "ic_photo_camera_white@3x.png", "filename" : "ic_photo_camera_white_3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
......
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