Merge pull request #208 from SimpleNexus/dev

Adds Support for Swift Package Manager

Author: rolandleth

LTHPasscodeViewController/LTHPasscodeViewController.m

@@ -10,13 +10,22 @@
 #import "LTHKeychainUtils.h"
 #import <LocalAuthentication/LocalAuthentication.h>
 
+#ifndef SWIFTPM_MODULE_BUNDLE
+#define SWIFTPM_MODULE_BUNDLE [NSBundle bundleWithPath:[[NSBundle bundleForClass:[LTHPasscodeViewController class]] pathForResource:@"LTHPasscodeViewController" ofType:@"bundle"]]
+#endif
+
 #define LTHiPad ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad)
 
 #define LTHFailedAttemptLabelHeight [_failedAttemptLabel.text sizeWithAttributes: @{NSFontAttributeName : _labelFont}].height
 
+#ifndef LTHLocalizedString
+#define LTHLocalizedString(key) [[NSBundle bundleWithPath:[[NSBundle bundleForClass:[LTHPasscodeViewController class]] pathForResource:@"LTHPasscodeViewController" ofType:@"bundle"]] localizedStringForKey:(key) value:@"" table:_localizationTableName]
+#endif
+
 #ifndef LTHPasscodeViewControllerStrings
-#define LTHPasscodeViewControllerStrings(key) \
-[[NSBundle bundleWithPath:[[NSBundle bundleForClass:[LTHPasscodeViewController class]] pathForResource:@"LTHPasscodeViewController" ofType:@"bundle"]] localizedStringForKey:(key) value:@"" table:_localizationTableName]
+#define LTHPasscodeViewControllerStrings(key) [LTHLocalizedString(key) length] == 0 \
+    ? [[NSBundle bundleWithPath: [SWIFTPM_MODULE_BUNDLE pathForResource:@"LTHPasscodeViewController" ofType:@"bundle"]] localizedStringForKey:(key) value:@"" table:_localizationTableName] \
+    : LTHLocalizedString(key)
 #endif
 
 // MARK: Please read
@@ -147,6 +156,7 @@ + (void)useKeychain:(BOOL)useKeychain {
 
 
 #pragma mark - Private methods
+
 - (void)_close {
     if (_displayedAsLockScreen) [self _dismissMe];
     else [self _cancelAndDismissMe];

Package.swift

@@ -0,0 +1,28 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "LTHPasscodeViewController",
+    defaultLocalization: "en",
+    platforms: [
+        .iOS(.v10)
+    ],
+    products: [
+        .library(
+            name: "LTHPasscodeViewController",
+            targets: ["LTHPasscodeViewController"]
+        ),
+    ],
+    targets: [
+        .target(
+            name: "LTHPasscodeViewController",
+            path: ".",
+            exclude: ["Demo", "CHANGELOG.md", "README.md"],
+            resources: [
+                .process("Localizations/LTHPasscodeViewController.bundle"),
+                .process("LICENSE.txt")
+            ],
+            publicHeadersPath: "LTHPasscodeViewController"
+        )
+    ]
+)

README.md

@@ -1,8 +1,31 @@
 # LTHPasscodeViewController
 Simple to use iOS 7 style Passcode - the one you get in Settings when changing your passcode.
 
+# Installation
+
+### Swift Package Manager
+
+__NOTE__: _These instructions are intended for usage on Xcode 11 and higher. Xcode 11 is the first version of Xcode that integrates Swift Package manager and makes it way easier to use than it was at the command line. If you are using older versions of Xcode, we recommend using CocoaPods._
+
+1. Go to File > Swift Packages > Add Package Dependency...
+2. Paste the URL to the `LTHPasscodeViewController` repo on GitHub (https://github.com/rolandleth/LTHPasscodeViewController.git) into the search bar, then hit the Next button:
+3. Select what version you want to use, then hit next (Xcode will automatically suggest the current version Up to Next Major).
+4. Select the `LTHPasscodeViewController` library and then hit finish.
+5. You're done!
+
+### CocoaPods
+
+[CocoaPods](https://cocoapods.org) is a dependency manager for Cocoa projects. For usage and installation instructions, visit their website. To integrate `LTHPasscodeViewController` into your Xcode project using CocoaPods, specify it in your `Podfile`:
+
+```ruby
+pod 'LTHPasscodeViewController', '~> 4.0.1'
+```
+
+### Manually
+
+Simply clone the repo and drag the contents of `LTHPasscodeViewController` to your project.
+
 # How to use
-Drag the contents of `LTHPasscodeViewController` to your project, or add `pod 'LTHPasscodeViewController'` to your Podfile (preffered).
 
 If your app uses extensions, `LTH_IS_APP_EXTENSION` needs to be defined:
 
@@ -14,8 +37,8 @@ Example, called in `application:didFinishLaunchingWithOptions`:
 ```objc
 [LTHPasscodeViewController useKeychain:NO];
 if ([LTHPasscodeViewController doesPasscodeExist]) {
-	if ([LTHPasscodeViewController didPasscodeTimerEnd])
-		[[LTHPasscodeViewController sharedUser] showLockScreenWithAnimation:YES
+    if ([LTHPasscodeViewController didPasscodeTimerEnd])
+        [[LTHPasscodeViewController sharedUser] showLockScreenWithAnimation:YES
                                                                  withLogout:NO
                                                              andLogoutTitle:nil];
 }
@@ -46,7 +69,7 @@ if ([LTHPasscodeViewController doesPasscodeExist]) {
 
 ```objc
 /**
- @param	viewController The view controller where the passcode view controller will be displayed.
+ @param viewController The view controller where the passcode view controller will be displayed.
  @param asModal        Set to YES to present as a modal, or to NO to push on the current nav stack.
  */
 - (void)showForEnablingPasscodeInViewController:(UIViewController *)viewController asModal:(BOOL)isModal;