From 372e21ef9334d6a3ce83cb6975a0502ad92d253f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=89=E9=9B=A8=E8=BE=B0?= Date: Wed, 24 Jan 2018 15:45:26 +0900 Subject: [PATCH 1/2] add. face id icon --- .../SmileLock-Example/Info.plist | 2 + .../faceid.imageset/Contents.json | 23 ++++++++ .../faceid.imageset/faceid.png | Bin 0 -> 1432 bytes .../faceid.imageset/faceid@2x.png | Bin 0 -> 3143 bytes .../faceid.imageset/faceid@3x.png | Bin 0 -> 5056 bytes SmileLock/Assets/PasswordContainerView.xib | 53 ++++++++++-------- SmileLock/Classes/PasswordContainerView.swift | 11 +++- 7 files changed, 64 insertions(+), 25 deletions(-) create mode 100644 SmileLock/Assets/Assets.xcassets/faceid.imageset/Contents.json create mode 100644 SmileLock/Assets/Assets.xcassets/faceid.imageset/faceid.png create mode 100644 SmileLock/Assets/Assets.xcassets/faceid.imageset/faceid@2x.png create mode 100644 SmileLock/Assets/Assets.xcassets/faceid.imageset/faceid@3x.png diff --git a/SmileLock-Example/SmileLock-Example/Info.plist b/SmileLock-Example/SmileLock-Example/Info.plist index 5ce55bb..10c25e4 100644 --- a/SmileLock-Example/SmileLock-Example/Info.plist +++ b/SmileLock-Example/SmileLock-Example/Info.plist @@ -28,6 +28,8 @@ LaunchScreen UIMainStoryboardFile PasswordLogin + NSFaceIDUsageDescription + Unlock it UIRequiredDeviceCapabilities armv7 diff --git a/SmileLock/Assets/Assets.xcassets/faceid.imageset/Contents.json b/SmileLock/Assets/Assets.xcassets/faceid.imageset/Contents.json new file mode 100644 index 0000000..0099257 --- /dev/null +++ b/SmileLock/Assets/Assets.xcassets/faceid.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "faceid.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "faceid@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "faceid@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/SmileLock/Assets/Assets.xcassets/faceid.imageset/faceid.png b/SmileLock/Assets/Assets.xcassets/faceid.imageset/faceid.png new file mode 100644 index 0000000000000000000000000000000000000000..80720a3437dc1da5f143309e6be3d9e7cca01e8d GIT binary patch literal 1432 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 literal 0 HcmV?d00001 diff --git a/SmileLock/Assets/PasswordContainerView.xib b/SmileLock/Assets/PasswordContainerView.xib index c538026..c585daa 100644 --- a/SmileLock/Assets/PasswordContainerView.xib +++ b/SmileLock/Assets/PasswordContainerView.xib @@ -1,8 +1,13 @@ - + + + + - + + + @@ -16,7 +21,7 @@ - + @@ -31,21 +36,21 @@ - + - + - + @@ -53,25 +58,25 @@ - + - - + + - - + + - - + + @@ -79,25 +84,25 @@ - + - + - + - + @@ -105,10 +110,10 @@ - + - - + +