commit 84f3ab03581247a976a75e8754a6f00d97084872 parent 5e5059592e19a88b8598ccd70b74a34b10940a27 Author: Naomi Welner <naomi@Naomis-MacBook-Air.local> Date: Mon, 18 Mar 2019 12:40:47 -0700 Add existing files Diffstat:
14 files changed, 66 insertions(+), 65 deletions(-)
diff --git a/.DS_Store b/.DS_Store Binary files differ. diff --git a/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/Pods-TeachersAssistant.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/Pods-TeachersAssistant.xcscheme @@ -7,15 +7,15 @@ buildImplicitDependencies = "YES"> <BuildActionEntries> <BuildActionEntry + buildForAnalyzing = "YES" buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> + buildForArchiving = "YES"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "DC3A57A44D7A30108A57480929F8FDFE" - BuildableName = "Pods_TeachersAssistant.framework" + BuildableName = "Pods-TeachersAssistant.framework" BlueprintName = "Pods-TeachersAssistant" ReferencedContainer = "container:Pods.xcodeproj"> </BuildableReference> @@ -23,45 +23,32 @@ </BuildActionEntries> </BuildAction> <TestAction - buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> <AdditionalOptions> </AdditionalOptions> </TestAction> <LaunchAction - buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + buildConfiguration = "Debug" allowLocationSimulation = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "DC3A57A44D7A30108A57480929F8FDFE" - BuildableName = "Pods_TeachersAssistant.framework" - BlueprintName = "Pods-TeachersAssistant" - ReferencedContainer = "container:Pods.xcodeproj"> - </BuildableReference> - </MacroExpansion> <AdditionalOptions> </AdditionalOptions> </LaunchAction> <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> + debugDocumentVersioning = "YES" + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES"> </ProfileAction> <AnalyzeAction buildConfiguration = "Debug"> diff --git a/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/Pods-TeachersAssistantTests.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/Pods-TeachersAssistantTests.xcscheme @@ -7,15 +7,15 @@ buildImplicitDependencies = "YES"> <BuildActionEntries> <BuildActionEntry + buildForAnalyzing = "YES" buildForTesting = "YES" buildForRunning = "YES" buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> + buildForArchiving = "YES"> <BuildableReference BuildableIdentifier = "primary" BlueprintIdentifier = "9115383C4EEFD422CC2FA6BC0AEEF0EE" - BuildableName = "Pods_TeachersAssistantTests.framework" + BuildableName = "Pods-TeachersAssistantTests.framework" BlueprintName = "Pods-TeachersAssistantTests" ReferencedContainer = "container:Pods.xcodeproj"> </BuildableReference> @@ -23,45 +23,32 @@ </BuildActionEntries> </BuildAction> <TestAction - buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> + shouldUseLaunchSchemeArgsEnv = "YES" + buildConfiguration = "Debug"> <AdditionalOptions> </AdditionalOptions> </TestAction> <LaunchAction - buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" debugDocumentVersioning = "YES" debugServiceExtension = "internal" + buildConfiguration = "Debug" allowLocationSimulation = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "9115383C4EEFD422CC2FA6BC0AEEF0EE" - BuildableName = "Pods_TeachersAssistantTests.framework" - BlueprintName = "Pods-TeachersAssistantTests" - ReferencedContainer = "container:Pods.xcodeproj"> - </BuildableReference> - </MacroExpansion> <AdditionalOptions> </AdditionalOptions> </LaunchAction> <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" savedToolIdentifier = "" useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> + debugDocumentVersioning = "YES" + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES"> </ProfileAction> <AnalyzeAction buildConfiguration = "Debug"> diff --git a/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/xcschememanagement.plist @@ -8,15 +8,11 @@ <dict> <key>isShown</key> <false/> - <key>orderHint</key> - <integer>0</integer> </dict> <key>Pods-TeachersAssistantTests.xcscheme</key> <dict> <key>isShown</key> <false/> - <key>orderHint</key> - <integer>1</integer> </dict> </dict> <key>SuppressBuildableAutocreation</key> diff --git a/Pods/Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant-frameworks.sh b/Pods/Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant-frameworks.sh @@ -153,16 +153,16 @@ strip_invalid_archs() { if [[ "$CONFIGURATION" == "Debug" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/GTMOAuth2/GTMOAuth2.framework" install_framework "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework" install_framework "${BUILT_PRODUCTS_DIR}/GoogleAPIClientForREST/GoogleAPIClientForREST.framework" - install_framework "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework" - install_framework "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework" + install_framework "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then + install_framework "${BUILT_PRODUCTS_DIR}/GTMOAuth2/GTMOAuth2.framework" install_framework "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework" install_framework "${BUILT_PRODUCTS_DIR}/GoogleAPIClientForREST/GoogleAPIClientForREST.framework" - install_framework "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework" - install_framework "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework" + install_framework "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/Pods/Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant-resources.sh b/Pods/Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant-resources.sh @@ -97,11 +97,9 @@ EOM esac } if [[ "$CONFIGURATION" == "Debug" ]]; then - install_resource "${PODS_ROOT}/GoogleAuthUtilities/Frameworks/frameworks/GoogleAuthUtilities.framework/Resources/GTMOAuth2ViewTouch.xib" install_resource "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle" fi if [[ "$CONFIGURATION" == "Release" ]]; then - install_resource "${PODS_ROOT}/GoogleAuthUtilities/Frameworks/frameworks/GoogleAuthUtilities.framework/Resources/GTMOAuth2ViewTouch.xib" install_resource "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle" fi diff --git a/Teachers' Assistant/.DS_Store b/Teachers' Assistant/.DS_Store Binary files differ. diff --git a/Teachers' Assistant/AppDelegate.swift b/Teachers' Assistant/AppDelegate.swift @@ -11,14 +11,16 @@ import UserNotifications @UIApplicationMain class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate { - + var window: UIWindow? func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) { completionHandler([.alert, .badge, .sound]) } - + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + + //Notification permission request UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .badge, .sound]) { (granted, error) in} UNUserNotificationCenter.current().delegate = self diff --git a/Teachers' Assistant/Info.plist b/Teachers' Assistant/Info.plist @@ -2,16 +2,10 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> - <key>NSLocationAlwaysUsageDescription</key> - <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> - <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> - <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> - <key>NSLocationWhenInUseUsageDescription</key> - <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> <key>CFBundleDevelopmentRegion</key> <string>$(DEVELOPMENT_LANGUAGE)</string> <key>CFBundleDisplayName</key> - <string>Teachers' Assistant</string> + <string>Teachers' Assistant</string> <key>CFBundleExecutable</key> <string>$(EXECUTABLE_NAME)</string> <key>CFBundleIdentifier</key> @@ -24,10 +18,27 @@ <string>APPL</string> <key>CFBundleShortVersionString</key> <string>1.0</string> + <key>CFBundleURLTypes</key> + <array> + <dict> + <key>CFBundleTypeRole</key> + <string>Editor</string> + <key>CFBundleURLSchemes</key> + <array> + <string>com.googleusercontent.apps.972154510182-o7q0uaps52kjs44driksc7jamo7olg2u</string> + </array> + </dict> + </array> <key>CFBundleVersion</key> <string>1</string> <key>LSRequiresIPhoneOS</key> <true/> + <key>NSLocationAlwaysAndWhenInUseUsageDescription</key> + <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> + <key>NSLocationAlwaysUsageDescription</key> + <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> + <key>NSLocationWhenInUseUsageDescription</key> + <string>Teachers' Assistant requires location services to enable app features and prevent abuse</string> <key>UILaunchStoryboardName</key> <string>LaunchScreen</string> <key>UIMainStoryboardFile</key> diff --git a/Teachers' Assistant/ViewControllerHome.swift b/Teachers' Assistant/ViewControllerHome.swift @@ -87,7 +87,7 @@ class ViewControllerHome: UIViewController { properButton = inOutButtonSet(color: ViewController.globalVariables.activeColorTheme, state: signedOut) signInOut.setImage(properButton, for: .normal) ViewController.globalVariables.globalOut = signedOut - //Google functionality + //Google } /* SIGN IN-OUT BUTTON END */ diff --git a/Teachers' Assistant/credentials.plist b/Teachers' Assistant/credentials.plist @@ -0,0 +1,15 @@ +<?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>CLIENT_ID</key> + <string>972154510182-o7q0uaps52kjs44driksc7jamo7olg2u.apps.googleusercontent.com</string> + <key>REVERSED_CLIENT_ID</key> + <string>com.googleusercontent.apps.972154510182-o7q0uaps52kjs44driksc7jamo7olg2u</string> + <key>PLIST_VERSION</key> + <string>1</string> + <key>BUNDLE_ID</key> + <string>com.figbertinc.TeachersAssistant</string> + </dict> + </plist> +\ No newline at end of file diff --git a/TeachersAssistant.xcodeproj/project.pbxproj b/TeachersAssistant.xcodeproj/project.pbxproj @@ -9,6 +9,7 @@ /* Begin PBXBuildFile section */ B30366162221E45A00BB9DC6 /* Brandeis_Web_HiRes_Orange.png in Resources */ = {isa = PBXBuildFile; fileRef = B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */; }; B30366182221E60C00BB9DC6 /* ViewControllerSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = B30366172221E60C00BB9DC6 /* ViewControllerSettings.swift */; }; + B312789B2240220C00E4F363 /* credentials.plist in Resources */ = {isa = PBXBuildFile; fileRef = B312789A2240220C00E4F363 /* credentials.plist */; }; B32BA0A92238D6DF0000E747 /* Brandeis_Web_HiRes_Orange_Inv.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA09E2238D6D80000E747 /* Brandeis_Web_HiRes_Orange_Inv.png */; }; B32BA0AA2238D6DF0000E747 /* Brandeis_Web_HiRes_Green.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA09F2238D6DA0000E747 /* Brandeis_Web_HiRes_Green.png */; }; B32BA0AB2238D6DF0000E747 /* Brandeis_Web_HiRes_Pink.png in Resources */ = {isa = PBXBuildFile; fileRef = B32BA0A02238D6DA0000E747 /* Brandeis_Web_HiRes_Pink.png */; }; @@ -87,6 +88,7 @@ 910BFE7031BA5BA4545B32C7 /* Pods-TeachersAssistant.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TeachersAssistant.release.xcconfig"; path = "Target Support Files/Pods-TeachersAssistant/Pods-TeachersAssistant.release.xcconfig"; sourceTree = "<group>"; }; B30366152221E45900BB9DC6 /* Brandeis_Web_HiRes_Orange.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Orange.png; sourceTree = "<group>"; }; B30366172221E60C00BB9DC6 /* ViewControllerSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewControllerSettings.swift; sourceTree = "<group>"; }; + B312789A2240220C00E4F363 /* credentials.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = credentials.plist; sourceTree = "<group>"; }; B32BA09E2238D6D80000E747 /* Brandeis_Web_HiRes_Orange_Inv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Orange_Inv.png; sourceTree = "<group>"; }; B32BA09F2238D6DA0000E747 /* Brandeis_Web_HiRes_Green.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Green.png; sourceTree = "<group>"; }; B32BA0A02238D6DA0000E747 /* Brandeis_Web_HiRes_Pink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Brandeis_Web_HiRes_Pink.png; sourceTree = "<group>"; }; @@ -267,6 +269,7 @@ B3D8E1DB220F7847007CAD3A /* Assets.xcassets */, B3D8E1DD220F7847007CAD3A /* LaunchScreen.storyboard */, B3D8E1E0220F7847007CAD3A /* Info.plist */, + B312789A2240220C00E4F363 /* credentials.plist */, B34CDBB2221650480031C28B /* Images */, ); path = "Teachers' Assistant"; @@ -384,6 +387,7 @@ B34CDBA2221650410031C28B /* LiveList (Orange).png in Resources */, B33C58B522395CE600E0E75F /* Sign-Out (Dark Blue Inv).png in Resources */, B33C58C122395CE600E0E75F /* Sign-In (Orange Inv).png in Resources */, + B312789B2240220C00E4F363 /* credentials.plist in Resources */, B32BA0AD2238D6DF0000E747 /* Brandeis_Web_HiRes_DarkBlue_Inv.png in Resources */, B32BA0B22238D6DF0000E747 /* Brandeis_Web_HiRes_Pink_Inv.png in Resources */, B34CDBA7221650410031C28B /* Sign-In (Orange).png in Resources */, diff --git a/TeachersAssistant.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/xcschememanagement.plist b/TeachersAssistant.xcodeproj/xcuserdata/naomi.xcuserdatad/xcschemes/xcschememanagement.plist @@ -12,7 +12,7 @@ <key>TeachersAssistant.xcscheme</key> <dict> <key>orderHint</key> - <integer>2</integer> + <integer>7</integer> </dict> </dict> </dict> diff --git a/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate b/TeachersAssistant.xcworkspace/xcuserdata/naomi.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ.