Unverified Commit 2e8a7fea authored by Zach Knox's avatar Zach Knox
Browse files

beginning handoff support and other minor updates

parent 33718654
......@@ -7,7 +7,7 @@ use_frameworks!
def ios_pods
pod 'RealmSwift'
pod 'ObjectMapper', '~> 3.0'
pod 'ObjectMapper', '~> 3.2'
pod "ObjectMapper+Realm"
#pod 'Segmentio', '~> 2.1'
......
......@@ -17,7 +17,7 @@ DEPENDENCIES:
- Crashlytics
- DeckTransition (~> 2.0)
- Fabric
- ObjectMapper (~> 3.0)
- ObjectMapper (~> 3.2)
- ObjectMapper+Realm
- RealmSwift
......@@ -30,6 +30,6 @@ SPEC CHECKSUMS:
Realm: 08b464b462d4f31bbd4ba5f5a1c8722ef0a700b7
RealmSwift: 973e1499c44ab571f894c2c908e2db450be280c3
PODFILE CHECKSUM: 1225e83da50847e17730900da3b05d9d69748392
PODFILE CHECKSUM: 999bfe9f7d07d176c0bb5bff060455f38135f947
COCOAPODS: 1.4.0
......@@ -17,7 +17,7 @@ DEPENDENCIES:
- Crashlytics
- DeckTransition (~> 2.0)
- Fabric
- ObjectMapper (~> 3.0)
- ObjectMapper (~> 3.2)
- ObjectMapper+Realm
- RealmSwift
......@@ -30,6 +30,6 @@ SPEC CHECKSUMS:
Realm: 08b464b462d4f31bbd4ba5f5a1c8722ef0a700b7
RealmSwift: 973e1499c44ab571f894c2c908e2db450be280c3
PODFILE CHECKSUM: 1225e83da50847e17730900da3b05d9d69748392
PODFILE CHECKSUM: 999bfe9f7d07d176c0bb5bff060455f38135f947
COCOAPODS: 1.4.0
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.associated-domains</key>
<array>
<string>whatsopen.gmu.edu</string>
<string>whatsopen.gmu.io</string>
</array>
</dict>
</plist>
......@@ -104,6 +104,7 @@
92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilterSelectionTableViewController.swift; sourceTree = "<group>"; };
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertDetailViewController.swift; sourceTree = "<group>"; };
92B89E2F2009444E00928284 /* PullingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PullingViewController.swift; sourceTree = "<group>"; };
92DA57CC20C99C0C00EFDE7C /* WhatsOpen - AppStore.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "WhatsOpen - AppStore.entitlements"; sourceTree = "<group>"; };
92EA81961FB7D1B500B1F6E3 /* PaddedUILabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PaddedUILabel.swift; path = WhatsOpen/PaddedUILabel.swift; sourceTree = SOURCE_ROOT; };
92F681571FC1353700393DF4 /* Pods-WhatsOpen-acknowledgements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Pods-WhatsOpen-acknowledgements.plist"; path = "Pods/Target Support Files/Pods-WhatsOpen/Pods-WhatsOpen-acknowledgements.plist"; sourceTree = SOURCE_ROOT; };
92F681591FC137CF00393DF4 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
......@@ -167,19 +168,16 @@
920D17961F6C5CD200D63295 /* Views */ = {
isa = PBXGroup;
children = (
92A2757220C8993200E1A102 /* Filters Views */,
9255418520857CF40058E420 /* CollectionViewCells */,
9255418420857CE40058E420 /* TableViewCells */,
92B89E2F2009444E00928284 /* PullingViewController.swift */,
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */,
9281AD7B2002CF1700D09203 /* SetIconTableViewController.swift */,
92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */,
92A2757120C8992600E1A102 /* Primary Views */,
924E0E302085851400C1F2AF /* DetailViewButtonsViewController.swift */,
9265F3A21F2C0B1500A54A21 /* AboutScreenViewController.swift */,
927C80D91EB02566009079AD /* SettingsTableViewController.swift */,
927C80DB1EB18B89009079AD /* FiltersTableViewController.swift */,
92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */,
9259134420784D66002E50B1 /* SelectOneDefaultTableViewController.swift */,
92182EBF1E95BD2C00192ABA /* FacilitiesListViewController.swift */,
);
path = Views;
sourceTree = "<group>";
......@@ -212,9 +210,29 @@
name = "Recovered References";
sourceTree = "<group>";
};
92A2757120C8992600E1A102 /* Primary Views */ = {
isa = PBXGroup;
children = (
92B89E2D20093E3600928284 /* AlertDetailViewController.swift */,
92182EC31E95C38400192ABA /* FacilityDetailViewController.swift */,
92182EBF1E95BD2C00192ABA /* FacilitiesListViewController.swift */,
);
path = "Primary Views";
sourceTree = "<group>";
};
92A2757220C8993200E1A102 /* Filters Views */ = {
isa = PBXGroup;
children = (
927C80DB1EB18B89009079AD /* FiltersTableViewController.swift */,
92B2D2FE1FF8599500349E90 /* FilterSelectionTableViewController.swift */,
);
path = "Filters Views";
sourceTree = "<group>";
};
CD81F5101DC0334600009FBD = {
isa = PBXGroup;
children = (
92DA57CC20C99C0C00EFDE7C /* WhatsOpen - AppStore.entitlements */,
CD81F51B1DC0334600009FBD /* WhatsOpen */,
CD81F51A1DC0334600009FBD /* Products */,
2EAE8AD7B1F0ADDED5057982 /* Pods */,
......@@ -357,6 +375,11 @@
9203CB822023D51A006ACC3B = {
DevelopmentTeam = K5MMVK2UFR;
ProvisioningStyle = Manual;
SystemCapabilities = {
com.apple.SafariKeychain = {
enabled = 1;
};
};
};
CD81F5181DC0334600009FBD = {
CreatedOnToolsVersion = 8.0;
......@@ -762,11 +785,13 @@
baseConfigurationReference = 310EA38816D0F5ADA89E7E4E /* Pods-WhatsOpen - AppStore.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "appicon-dev";
CODE_SIGN_ENTITLEMENTS = "WhatsOpen - AppStore.entitlements";
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = K5MMVK2UFR;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/**",
......@@ -777,7 +802,8 @@
PRIMARYICON = "appicon-dev";
PRODUCT_BUNDLE_IDENTIFIER = edu.gmu.srct.whatsopen;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "b7d91eb0-1140-4c4c-8a3e-a4b698a70a43";
PROVISIONING_PROFILE_SPECIFIER = "What's Open Development";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2";
......@@ -790,11 +816,12 @@
baseConfigurationReference = D0DDF00600DA24AA2749FA0B /* Pods-WhatsOpen - AppStore.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = "appicon-dev";
CODE_SIGN_ENTITLEMENTS = "WhatsOpen - AppStore.entitlements";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 4;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = K5MMVK2UFR;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/**",
......@@ -805,7 +832,8 @@
PRIMARYICON = "appicon-dev";
PRODUCT_BUNDLE_IDENTIFIER = edu.gmu.srct.whatsopen;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE = "b7d91eb0-1140-4c4c-8a3e-a4b698a70a43";
PROVISIONING_PROFILE_SPECIFIER = "What's Open Development";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
SWIFT_VERSION = 4.0;
......@@ -819,6 +847,7 @@
baseConfigurationReference = F9776DBFE496D6125BCDE676 /* Pods-WhatsOpen - AppStore.app store.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = appicon;
CODE_SIGN_ENTITLEMENTS = "WhatsOpen - AppStore.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
......
......@@ -35,6 +35,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}
func application(_ application: UIApplication, willContinueUserActivityWithType userActivityType: String) -> Bool {
guard userActivity?.activityType == NSUserActivityTypeBrowsingWeb,
let incomingURL = userActivity?.webpageURL else {
return false
}
print(incomingURL)
return true
}
func initAlerts(_ defaults: UserDefaults) {
let alerts = defaults.dictionary(forKey: "alerts")
if alerts == nil {
......
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="DGD-49-9Ue">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="DGD-49-9Ue">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
......
......@@ -68,6 +68,19 @@ class AboutScreenViewController: UIViewController, UITableViewDelegate, UITableV
}
}
func tableView(_ tableView: UITableView, willDisplayHeaderView view: UIView, forSection section: Int) {
if let headerView = view as? UITableViewHeaderFooterView {
switch section {
case 0:
headerView.textLabel?.text = "What's Open for iOS is an open source project created by students at George Mason University"
case 1:
headerView.textLabel?.text = "Thanks to the contributors to What's Open!"
default:
headerView.textLabel?.text = ""
}
}
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withIdentifier: "Contributor", for: indexPath) as! SettingTableViewCell
......
......@@ -17,6 +17,7 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
@IBOutlet var OpenLabel: UILabel!
@IBOutlet var CategoryLabel: UILabel!
@IBOutlet var OpenTimesList: UITableView!
let activity = NSUserActivity(activityType: "facility")
var facility: Facility!
......@@ -39,6 +40,10 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
return .lightContent
}
override func viewDidDisappear(_ animated: Bool) {
activity.resignCurrent()
}
override func viewDidLoad() {
super.viewDidLoad()
......@@ -70,6 +75,8 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
if #available(iOS 11.0, *) {
navigationItem.largeTitleDisplayMode = .never
}
setActivityUp()
// NameLabel.font = UIFont.preferredFont(forTextStyle: .headline)
// PlaceLabel.font = UIFont.preferredFont(forTextStyle: .subheadline)
......@@ -77,6 +84,17 @@ class FacilityDetailViewController: UIViewController, UITableViewDelegate, UITab
// favoritesButton.titleLabel?.font = UIFont.preferredFont(forTextStyle: .body)
}
func setActivityUp() {
activity.isEligibleForHandoff = true
activity.addUserInfoEntries(from: ["facility": facility.facilityName])
activity.title = facility.facilityName
activity.keywords = Set<String>(arrayLiteral: facility.facilityName, facility.facilityLocation!.building)
//activity.keywords = [facility.facilityName, facility.facilityLocation?.building]
activity.webpageURL = URL(string: "https://whatsopen.gmu.edu/")
activity.becomeCurrent()
}
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
......
{
"webcredentials": {
"apps": [ "K5MMVK2UFR.edu.gmu.srct.whatsopen"]
},
"applinks": {
"apps": [],
"details": [
{
"appID": "K5MMVK2UFR.edu.gmu.srct.whatsopen",
"paths": ["/"]
}
]
}
}
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