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.

Sign up for GitHub

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

Jump to bottom

Upgraded Ionicons to v4.4.8 #47

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgraded Ionicons to v4.4.8 #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f2b8ae
upgrade Ionicons to v4.4.8
thantthet Dec 12, 2018
e5ae1b2
update ionicons name list
thantthet Dec 13, 2018
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
Binary file modified Source/Fonts/Ionicons.ttf
100755 → 100644
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions Source/SwiftIcons.swift
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SwiftIconsApp/IconDetailViewController.swift
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion SwiftIconsApp/LibraryViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class LibraryViewController: UICollectionViewController, UICollectionViewDelegat
var bottomBackgroundColors = ["c0392b", "d35400", "f39c12", "27ae60", "16a085", "2980b9", "8e44ad", "B68AA5", "7f8c8d", "2c3e50", "8781bd"]
var objects = ["UIImage", "UIImageView", "UILabel", "UIButton", "UISegmentedControl", "UITabBarItem", "UISlider", "UIBarButtonItem", "UIViewController", "UITextField", "UIStepper"]
var objectNames = ["Image", "Image View", "Label", "Button", "Segmented Control", "Tab Bar Item", "Slider", "Item", "View Controller", "Text", "Stepper"]
var icons: [FontType] = [.ionicons(.images), .fontAwesomeRegular(.building), .fontAwesomeRegular(.grinWink), .ionicons(.iosCircleFilled), .fontAwesomeRegular(.handRock), .ionicons(.iosStar), .ionicons(.iosToggle), .fontAwesomeRegular(.kissBeam), .ionicons(.iphone), .fontAwesomeRegular(.flushed), .fontAwesomeRegular(.smile)]
var icons: [FontType] = [.ionicons(.iosImages), .fontAwesomeRegular(.building), .fontAwesomeRegular(.grinWink), .ionicons(.iosBicycle), .fontAwesomeRegular(.handRock), .ionicons(.iosStar), .ionicons(.iosSwitch), .fontAwesomeRegular(.kissBeam), .ionicons(.iosPhonePortrait), .fontAwesomeRegular(.flushed), .fontAwesomeRegular(.smile)]

override func viewDidLoad() {
super.viewDidLoad()
Expand Down
8 changes: 4 additions & 4 deletions SwiftIconsApp/ObjectsDetailsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ class ObjectsDetailsViewController: UIViewController {

case 2:
let label1 = UILabel(frame: CGRect(x: 20, y: 20, width: screenWidth/2-40, height: screenWidth/2-40))
label1.setIcon(icon: .ionicons(.paintbrush), iconSize: 70)
label1.setIcon(icon: .ionicons(.iosBrush), iconSize: 70)
label1.isUserInteractionEnabled = true
label1.tag = 21
let tap21 = UITapGestureRecognizer(target: self, action: #selector(tapped(gesture:)))
Expand All @@ -139,7 +139,7 @@ class ObjectsDetailsViewController: UIViewController {
label3.addGestureRecognizer(tap23)

let label4 = UILabel(frame: CGRect(x: screenWidth/2+20, y: screenWidth/2, width: screenWidth/2-40, height: screenWidth/2-40))
label4.setIcon(prefixText: "Medal ", prefixTextColor: textColor, icon: .ionicons(.ribbonA), iconColor: textColor, postfixText: "", postfixTextColor: textColor, size: nil, iconSize: 40)
label4.setIcon(prefixText: "Medal ", prefixTextColor: textColor, icon: .ionicons(.iosRibbon), iconColor: textColor, postfixText: "", postfixTextColor: textColor, size: nil, iconSize: 40)
label4.isUserInteractionEnabled = true
label4.tag = 24
let tap24 = UITapGestureRecognizer(target: self, action: #selector(tapped(gesture:)))
Expand Down Expand Up @@ -191,7 +191,7 @@ class ObjectsDetailsViewController: UIViewController {
button3.addGestureRecognizer(tap33)

let button4 = UIButton(frame: CGRect(x: screenWidth/2+20, y: screenWidth/2, width: screenWidth/2-40, height: screenWidth/2-40))
button4.setIcon(prefixText: "Happy ", prefixTextFont: font1!, icon: .ionicons(.happy), postfixText: " face", postfixTextFont: font2!, forState: UIControl.State.normal)
button4.setIcon(prefixText: "Happy ", prefixTextFont: font1!, icon: .ionicons(.mdHappy), postfixText: " face", postfixTextFont: font2!, forState: UIControl.State.normal)
button4.isUserInteractionEnabled = true
button4.tag = 34
let tap34 = UITapGestureRecognizer(target: self, action: #selector(tapped(gesture:)))
Expand Down Expand Up @@ -307,7 +307,7 @@ class ObjectsDetailsViewController: UIViewController {

case 7:
navigationItem.rightBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: self, action: #selector(barButtonItem(sender:)))
navigationItem.rightBarButtonItem?.setIcon(icon: .ionicons(.navicon), iconSize: 36, color: textColor, cgRect: CGRect(x: 30, y: 30, width: 30, height: 30), target: self, action: #selector(barButtonItem(sender:)))
navigationItem.rightBarButtonItem?.setIcon(icon: .ionicons(.iosNavigate), iconSize: 36, color: textColor, cgRect: CGRect(x: 30, y: 30, width: 30, height: 30), target: self, action: #selector(barButtonItem(sender:)))

print("")
print("Example Usage")
Expand Down