Merge pull request #73 from ThriveCommunityChurch/dev

Merge passing build for 1.6.2 into master
ThriveCommunityChurch · Mar 18, 2018 · ce9e209 · ce9e209
2 parents 65b13f5 + ddd39de
commit ce9e209
Show file tree

Hide file tree

Showing 14 changed files with 402 additions and 577 deletions.
diff --git a/Main.storyboard b/Main.storyboard
diff --git a/Podfile b/Podfile
@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '10.0'
 
 target 'Thrive Church Official App' do
   # Comment the next line if you're not using Swift and don't want to use dynamic frameworks

diff --git a/README.md b/README.md
@@ -1,14 +1,13 @@
 # Thrive Church Official App
 
-This application was creted by Thrive Community Church in Estero, FL for iPhone.
+This application was created by Thrive Community Church in Estero, FL for iPhone.
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/93736df555dd47b5b6cbf4a6fa544949)](https://www.codacy.com/app/wyattbaggett/ThriveChurchOfficialApp?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=ThriveCommunityChurch/ThriveChurchOfficialApp&amp;utm_campaign=Badge_Grade)
 
 ## Download Instructions
 Visit the [download link](https://itunes.apple.com/us/app/thrive-church-official-app/id1138008288?mt=8)
 **OR** search for *Thrive Church Official App* in the [*Apple iTunes*](https://www.apple.com/itunes/) Store.
 
-
 ## System Requirements
 
 * iPhone running iOS 10.0 or Later
@@ -19,6 +18,7 @@ Visit the [download link](https://itunes.apple.com/us/app/thrive-church-official
 
 * Listen to sermons on the go
 * Read the entire Bible
+* Supporting iPhone X
 * Stay connected to Thrive FGCU
 * Donate to our ministry and setup automatic payments
 * Take notes during the sermon then share them with your friends or save them for later
@@ -34,53 +34,17 @@ For a full listing of features visit our [Website](http://thrive-fl.org).
 ### Testing Team
 
 * **Debora Lobaina** - QA / Testing
-* **Phil Klopke** -Testing
+* **Phil Klopke** - Testing
+* **[Joel Butcher](https://github.com/joelbutcher)** - QA
 
 ## Support & Bug Reports
 Please visit http://thrive-fl.org/app-support/ to submit a Support Ticket OR you can post it as an issue to this repository.
 
-
 ### Acknowledgements
 Thank you to everyone who uses this application, we made it for you - to help make taking notes and hearing the gospel message that much easier for you. Made with ❤
 
 ## Contributing
 Read our [CONTRIBUTING.md](https://github.com/ThriveCommunityChurch/ThriveChurchOfficialApp/blob/master/CONTRIBUTING.md) for more information.
 
 ## Version History
-### 1.6.1  —  Feb 7, 2018 
-- Fixed an issue where the notes page would crash if there were no notes currently saved
-- Fixed an issue where the cursor would completely dissapear when taking a long note
-- Updated Contact information for Thrive FGCU
-
-### 1.6  —  Nov 18, 2017
-- UI Improvements
-- Supports iPhone X
-- Stability Improvements
-- Fixed a bug where the first note made following installation was not saved properly
-- Fixed application crash for some devices running on iOS 9
-
-### 1.5.1 — Sept 15, 2017
-- Fixed the text area on the Notes tab
-- Fixed Translucent Navigation Bars
-- Support Token IDs when emailing support
-
-### 1.5  —  Aug 27, 2017
-- Major UI Overhaul
-- Improvements to the User Experience
-- iOS 11 Support
-- Added Easier Configuration for Application Settings 
-- Bug Fixes & other Localization Improvements
-
-### 1.3  —  May 24, 2017
-- Minor Updates and Improvements
-- Optimizations
-- Big things coming in future updates!
-
-### 1.2  —  Jan 18, 2017
-- You can now watch sermons in HD Video
-- Stay connected to Thrive FGCU
-- Fully supporting iOS 10
-- Big fixes | Stability improvements
-
-### 1.0  —  Aug 14, 2016
-- Initial Release
+See all releases in the [VersionHistory.md](https://github.com/ThriveCommunityChurch/ThriveChurchOfficialApp/blob/master/VersionHistory.md)
diff --git a/Thrive Church Official App.xcodeproj/project.pbxproj b/Thrive Church Official App.xcodeproj/project.pbxproj
@@ -12,16 +12,15 @@
 		413C263C1CFE3EFC00D8AE26 /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 413C263B1CFE3EFC00D8AE26 /* MessageUI.framework */; };
 		41FCF7F11CF21719006C366E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41FCF7F01CF21719006C366E /* AppDelegate.swift */; };
 		41FCF8081CF21719006C366E /* Thrive_Community_ChurchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41FCF8071CF21719006C366E /* Thrive_Community_ChurchTests.swift */; };
-		41FF24A71D171EC30048E6AF /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41FF24A51D171EC30048E6AF /* AudioToolbox.framework */; };
 		41FF24A81D171EC30048E6AF /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 41FF24A61D171EC30048E6AF /* CoreAudio.framework */; };
 		68C52DF074924D43C5FEBA5A /* Pods_Thrive_Church_Official_AppUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CAFC81711DE067EE192456F /* Pods_Thrive_Church_Official_AppUITests.framework */; };
 		DC2667DF1F37FBA20020424C /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC2667DE1F37FBA20020424C /* SettingsViewController.swift */; };
-		DC3835241F68D82700F05E8B /* NotificationCenter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC3835231F68D82600F05E8B /* NotificationCenter.framework */; };
+		DC64031D2057821E00176BFB /* DeviceTypeExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC64031C2057821E00176BFB /* DeviceTypeExtension.swift */; };
+		DC64031F205783DE00176BFB /* TimestampExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC64031E205783DE00176BFB /* TimestampExtension.swift */; };
 		DC7652721EEB5395007C0998 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DC7652711EEB5395007C0998 /* Assets.xcassets */; };
 		DC98E1CD1D354F5500C9395B /* Thrive_Community_ChurchUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41FCF8121CF21719006C366E /* Thrive_Community_ChurchUITests.swift */; };
 		DCA554441F6AD46600E00006 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = DC593B1A1F56542000616A28 /* GoogleService-Info.plist */; };
 		DCC9D46F1F316A7C0055F548 /* ContactModalViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DCC9D46E1F316A7C0055F548 /* ContactModalViewController.swift */; };
-		DCCC096F1F68DEC5003395C0 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DCCC096E1F68DEC5003395C0 /* UserNotifications.framework */; };
 		DCDFCE5C1FA00C700011AEC3 /* Pods_Thrive_Church_Official_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 72CB99E1F4640C3FCA51CD9F /* Pods_Thrive_Church_Official_App.framework */; };
 		DCE362C01F0560E400725F11 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DCE362BF1F05603300725F11 /* Main.storyboard */; };
 		DCE362C11F0560E400725F11 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DC01B7F21F04936E002784E7 /* LaunchScreen.storyboard */; };
@@ -105,8 +104,6 @@
 		DCE363101F05610600725F11 /* SmallGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B8491F0494FF002784E7 /* SmallGroupViewController.swift */; };
 		DCE363111F05610600725F11 /* SermonsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B84B1F0494FF002784E7 /* SermonsViewController.swift */; };
 		DCE363121F05610600725F11 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B84D1F0494FF002784E7 /* AboutViewController.swift */; };
-		DCE363131F05610600725F11 /* EspanolAboutThriveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B84E1F0494FF002784E7 /* EspanolAboutThriveViewController.swift */; };
-		DCE363141F05610600725F11 /* EspanolSermonNotesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B84F1F0494FF002784E7 /* EspanolSermonNotesViewController.swift */; };
 		DCE363151F05610600725F11 /* giveViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B8501F0494FF002784E7 /* giveViewController.swift */; };
 		DCE363161F05610600725F11 /* ImNewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B8511F0494FF002784E7 /* ImNewViewController.swift */; };
 		DCE363171F05610600725F11 /* MeetTheTeamViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC01B8521F0494FF002784E7 /* MeetTheTeamViewController.swift */; };
@@ -254,8 +251,6 @@
 		DC01B8491F0494FF002784E7 /* SmallGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallGroupViewController.swift; sourceTree = "<group>"; };
 		DC01B84B1F0494FF002784E7 /* SermonsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SermonsViewController.swift; sourceTree = "<group>"; };
 		DC01B84D1F0494FF002784E7 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
-		DC01B84E1F0494FF002784E7 /* EspanolAboutThriveViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EspanolAboutThriveViewController.swift; sourceTree = "<group>"; };
-		DC01B84F1F0494FF002784E7 /* EspanolSermonNotesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EspanolSermonNotesViewController.swift; sourceTree = "<group>"; };
 		DC01B8501F0494FF002784E7 /* giveViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = giveViewController.swift; sourceTree = "<group>"; };
 		DC01B8511F0494FF002784E7 /* ImNewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImNewViewController.swift; sourceTree = "<group>"; };
 		DC01B8521F0494FF002784E7 /* MeetTheTeamViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MeetTheTeamViewController.swift; sourceTree = "<group>"; };
@@ -270,6 +265,8 @@
 		DC38352A1F68D8C800F05E8B /* Protobuf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Protobuf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DC5325061D3AA70D00BDB2B6 /* Thrive Community Church.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Thrive Community Church.entitlements"; sourceTree = "<group>"; };
 		DC593B1A1F56542000616A28 /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		DC64031C2057821E00176BFB /* DeviceTypeExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceTypeExtension.swift; sourceTree = "<group>"; };
+		DC64031E205783DE00176BFB /* TimestampExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimestampExtension.swift; sourceTree = "<group>"; };
 		DC7652711EEB5395007C0998 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		DCA554461F6AD47B00E00006 /* Protobuf.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Protobuf.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DCC9D46E1F316A7C0055F548 /* ContactModalViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactModalViewController.swift; sourceTree = "<group>"; };
@@ -284,9 +281,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DCDFCE5C1FA00C700011AEC3 /* Pods_Thrive_Church_Official_App.framework in Frameworks */,
-				DCCC096F1F68DEC5003395C0 /* UserNotifications.framework in Frameworks */,
-				DC3835241F68D82700F05E8B /* NotificationCenter.framework in Frameworks */,
-				41FF24A71D171EC30048E6AF /* AudioToolbox.framework in Frameworks */,
 				41FF24A81D171EC30048E6AF /* CoreAudio.framework in Frameworks */,
 				41341BF81D08716B0070AEF5 /* Social.framework in Frameworks */,
 				413C263C1CFE3EFC00D8AE26 /* MessageUI.framework in Frameworks */,
@@ -415,6 +409,8 @@
 			children = (
 				DC01B7F51F0494EE002784E7 /* dismissKeyboard.swift */,
 				DC01B7F61F0494EE002784E7 /* StringUtils.swift */,
+				DC64031C2057821E00176BFB /* DeviceTypeExtension.swift */,
+				DC64031E205783DE00176BFB /* TimestampExtension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -544,8 +540,6 @@
 			isa = PBXGroup;
 			children = (
 				DC01B84D1F0494FF002784E7 /* AboutViewController.swift */,
-				DC01B84E1F0494FF002784E7 /* EspanolAboutThriveViewController.swift */,
-				DC01B84F1F0494FF002784E7 /* EspanolSermonNotesViewController.swift */,
 				DC01B8501F0494FF002784E7 /* giveViewController.swift */,
 				DC01B8511F0494FF002784E7 /* ImNewViewController.swift */,
 				DC01B8521F0494FF002784E7 /* MeetTheTeamViewController.swift */,
@@ -928,6 +922,7 @@
 				DCE362DB1F05610600725F11 /* ReadHabakkukViewController.swift in Sources */,
 				DCE362DC1F05610600725F11 /* ReadHaggaiVewController.swift in Sources */,
 				DCE362DD1F05610600725F11 /* ReadHebrewsViewController.swift in Sources */,
+				DC64031D2057821E00176BFB /* DeviceTypeExtension.swift in Sources */,
 				DCE362DE1F05610600725F11 /* ReadHoseaViewController.swift in Sources */,
 				DCE362DF1F05610600725F11 /* ReadIsaiahViewController.swift in Sources */,
 				DCE362E01F05610600725F11 /* ReadJamesViewController.swift in Sources */,
@@ -967,6 +962,7 @@
 				DCE363011F05610600725F11 /* ReadTitusViewController.swift in Sources */,
 				DCE363021F05610600725F11 /* ReadZechariahViewController.swift in Sources */,
 				DCE363031F05610600725F11 /* ReadZepheniahViewController.swift in Sources */,
+				DC64031F205783DE00176BFB /* TimestampExtension.swift in Sources */,
 				DCE363041F05610600725F11 /* ContactButtonViewController.swift in Sources */,
 				DCE363051F05610600725F11 /* DirectionsViewController.swift in Sources */,
 				DCE363061F05610600725F11 /* EventsFeedViewController.swift in Sources */,
@@ -982,8 +978,6 @@
 				DCE363101F05610600725F11 /* SmallGroupViewController.swift in Sources */,
 				DCE363111F05610600725F11 /* SermonsViewController.swift in Sources */,
 				DCE363121F05610600725F11 /* AboutViewController.swift in Sources */,
-				DCE363131F05610600725F11 /* EspanolAboutThriveViewController.swift in Sources */,
-				DCE363141F05610600725F11 /* EspanolSermonNotesViewController.swift in Sources */,
 				DCE363151F05610600725F11 /* giveViewController.swift in Sources */,
 				DCE363161F05610600725F11 /* ImNewViewController.swift in Sources */,
 				DCE363171F05610600725F11 /* MeetTheTeamViewController.swift in Sources */,
@@ -1075,7 +1069,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACH_O_TYPE = mh_execute;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -1124,7 +1118,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MACH_O_TYPE = mh_execute;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PROVISIONING_PROFILE = "";

diff --git a/Thrive Community Church/AppDelegate.swift b/Thrive Community Church/AppDelegate.swift
@@ -10,11 +10,9 @@ import UIKit
 import AVFoundation
 import CoreVideo
 import MediaPlayer
-import Firebase
-import UserNotifications
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate, AVAudioPlayerDelegate, UNUserNotificationCenterDelegate  {
+class AppDelegate: UIResponder, UIApplicationDelegate, AVAudioPlayerDelegate {
 
     var window: UIWindow?
 
@@ -23,34 +21,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AVAudioPlayerDelegate, UN
         // Override point for customization after application launch.
         print("Application is Active")
 
-//        // Registering notifications
-//        if #available(iOS 10.0, *) {
-//            // For iOS 10 display notification (sent via APNS)
-//            UNUserNotificationCenter.current().delegate = self
-//
-//            let authOptions: UNAuthorizationOptions = [.alert, .badge, .sound]
-//            UNUserNotificationCenter.current().requestAuthorization(
-//                options: authOptions,
-//                completionHandler: {_, _ in })
-//
-//            // For iOS 10 data message (sent via FCM)
-//            //FIRMessaging.messaging().remoteMessageDelegate = self
-//
-//        } else {
-//            let settings: UIUserNotificationSettings =
-//                UIUserNotificationSettings(types: [.alert, .badge, .sound], categories: nil)
-//            application.registerUserNotificationSettings(settings)
-//        }
-//
-//        application.registerForRemoteNotifications()
-//
-//        let token = Messaging.messaging().fcmToken
-//        print("FCM token: \(token ?? "")")
-//
-//        //End registration
-//        // Use Firebase library to configure APIs
-//        FirebaseApp.configure()
-
         do {
             try AVAudioSession.sharedInstance().setCategory(AVAudioSessionCategoryPlayback)
             print("Setting the player to play no matter what")
@@ -119,64 +89,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate, AVAudioPlayerDelegate, UN
         print("does this work? \(rc1.rawValue)")
     }
 
-    // FCM Token was updated - Firebase
-    func messaging(_ messaging: Messaging, didRefreshRegistrationToken fcmToken: String) {
-        print("Firebase registration token: \(fcmToken)")
-    }
-
-    // Provide APNSToken
-    func application(_ application: UIApplication,
-                     didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
-
-        var token = ""
-        for i in 0..<deviceToken.count {
-            token = token + String(format: "%02.2hhx", arguments: [deviceToken[i]])
-        }
-        print("Registration succeeded! Token: ", token)
-    }
-
-    // Failed Notifs registration
-    func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
-        print("Registration failed!")
-    }
-
-//*****************************************Recieve Notifications***********************
-
-//    // Firebase notification received
-//    @available(iOS 10.0, *)
-//    func userNotificationCenter(_ center: UNUserNotificationCenter,  willPresent notification: UNNotification,
-//                withCompletionHandler completionHandler: @escaping (_ options: UNNotificationPresentationOptions) -> Void) {
-//
-//        // Handle push while app is in the foreground
-//        print("Handle push from foreground\(notification.request.content.userInfo)")
-//
-//        let dict = notification.request.content.userInfo["aps"] as! NSDictionary
-//        let d : [String : Any] = dict["alert"] as! [String : Any]
-//        let body : String = d["body"] as! String
-//        let title : String = d["title"] as! String
-//        print("Title:\(title) + body:\(body)")
-//        self.showLocalAlert(title: title, message: body, buttonTitle: "Dismiss", window: self.window!)
-//    }
-//
-//    @available(iOS 10.0, *)
-//    func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) {
-//        // If you set a member variable in didReceiveRemoteNotification, you will know if this is from closed or background
-//        print("Handle push from background or closed\(response.notification.request.content.userInfo)")
-//    }
-//
-//    // Show local notif if the application is in the Foreground
-//    func showLocalAlert(title: String, message: String, buttonTitle: String, window: UIWindow) {
-//        print("Foreground?")
-//        let alert = UIAlertController(title: title,
-//                                      message: message,
-//                                      preferredStyle: UIAlertControllerStyle.alert)
-//        alert.addAction(UIAlertAction(title: buttonTitle,
-//                                      style: UIAlertActionStyle.default,
-//                                      handler: nil))
-//        window.rootViewController?.present(alert, animated: true,
-//                                      completion: nil)
-//    }
-
-//*************************************************************************************
-
 }