diff --git a/Pendu/Assets.xcassets/humain.imageset/Contents.json b/Pendu/Assets.xcassets/humain.imageset/Contents.json new file mode 100644 index 0000000000000000000000000000000000000000..7a61350bfe4f5012ea0654de06cf4406e69d9c93 --- /dev/null +++ b/Pendu/Assets.xcassets/humain.imageset/Contents.json @@ -0,0 +1,12 @@ +{ + "images" : [ + { + "filename" : "humain.png", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Pendu/Assets.xcassets/humain.imageset/humain.png b/Pendu/Assets.xcassets/humain.imageset/humain.png new file mode 100644 index 0000000000000000000000000000000000000000..9205b05f2fd39b560660d0367c4fc9dfccc7afc8 Binary files /dev/null and b/Pendu/Assets.xcassets/humain.imageset/humain.png differ diff --git a/Pendu/ButtonTemplate.swift b/Pendu/ButtonTemplate.swift index a44c2e0826574d77f85b78f5f0d3fb7633ef8d2d..649dd03cf02df2e8338d77200492062d9b012296 100644 --- a/Pendu/ButtonTemplate.swift +++ b/Pendu/ButtonTemplate.swift @@ -8,7 +8,7 @@ struct ButtonTemplateViewModel { final class ButtonTemplate: UIButton { private let primaryLabel: UILabel = { let label = UILabel() - label.numberOfLines = 1 + label.numberOfLines = 0 label.textAlignment = .center label.textColor = .white label.font = .systemFont(ofSize: 20, weight: .semibold) diff --git a/Pendu/ViewController.swift b/Pendu/ViewController.swift index 3088ee9be03d422d9368630427c2a23534b23352..c0c488fd0234178f71d55dcd99aa675342925608 100644 --- a/Pendu/ViewController.swift +++ b/Pendu/ViewController.swift @@ -34,6 +34,11 @@ class ViewController: UIViewController { view.addBackground() super.viewDidLoad() + let image = UIImage(named: "humain") + let imageView = UIImageView(image: image!) + imageView.frame = CGRect(x: 50, y: 300, width: 250, height: 250) + view.addSubview(imageView) + let label = UILabel(frame: CGRect(x: 0, y: 0, width: 200, height: 40)) label.center = CGPoint(x: 160, y: 230) label.font = UIFont(name: "whatever it takes", size: 40) @@ -42,12 +47,11 @@ class ViewController: UIViewController { label.text = "Pendu" self.view.addSubview(label) - -// -// let ButtonLetter = ButtonTemplate(frame: CGRect(x: 0, y: 0, width: 30, height: 30)) + +// let ButtonLetter = ButtonTemplate(frame: CGRect(x: 1000, y: 1500, width: 150, height: 30)) // view.addSubview(ButtonLetter) // ButtonLetter.center = view.center -// ButtonLetter.configure(with: ButtonTemplateViewModel(primaryColor: "A")) +// ButtonLetter.configure(with: ButtonTemplateViewModel(primaryColor: "Commencer")) }