Refactor project structure

BigGulp WatchKit Extension/ActionInterfaceController.swift

@@ -8,6 +8,7 @@
 
 import WatchKit
 import Foundation
+import MMWormhole
 
 class ActionInterfaceController: WKInterfaceController {
 

BigGulp WatchKit Extension/InterfaceController.swift

@@ -8,7 +8,7 @@
 
 import WatchKit
 import Foundation
-
+import MMWormhole
 
 class InterfaceController: WKInterfaceController {
 

BigGulp/AppDelegate.swift

@@ -1,4 +1,6 @@
 import UIKit
+import MMWormhole
+import DPMeterView
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -7,8 +9,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     let wormhole = MMWormhole(applicationGroupIdentifier: "group.it.fancypixel.BigGulp", optionalDirectory: "biggulp")
 
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-        GAI.sharedInstance().trackerWithTrackingId("UA-XXXXXXXX-X")
-        GAI.sharedInstance().trackUncaughtExceptions = true
 
         DPMeterView.appearance().trackTintColor = UIColor.lightGray()
         DPMeterView.appearance().progressTintColor = UIColor.mainColor()

BigGulp/Model/Entry.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Realm
 
 class Entry: RLMObject {
     dynamic var date = Entry.defaultDate()

BigGulp/Model/EntryHandler.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Realm
 
 class EntryHandler: NSObject {
     func currentEntry() -> Entry {

BigGulp/Model/Gulp.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Realm
 
 class Gulp: RLMObject {
     dynamic var date = NSDate()

BigGulp/Support/Globals.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AHKActionSheet
 
 class Globals {
     class func numericToolbar(target: AnyObject, selector: Selector, barColor: UIColor = UIColor.whiteColor(), textColor: UIColor = UIColor.mainColor()) -> UIToolbar {

BigGulp/Support/NotificationHelper.swift

@@ -1,4 +1,6 @@
 import Foundation
+import UIKit
+import MMWormhole
 
 class NotificationHelper {
 
@@ -73,6 +75,6 @@ class NotificationHelper {
 
     class func addGulp(size: String) {
         EntryHandler().addGulp(NSUserDefaults.groupUserDefaults().doubleForKey(size))
-         MMWormhole(applicationGroupIdentifier: "group.it.fancypixel.BigGulp", optionalDirectory: "biggulp").passMessageObject("todayUpdate", identifier: "mainUpdate")
+        MMWormhole(applicationGroupIdentifier: "group.it.fancypixel.BigGulp", optionalDirectory: "biggulp").passMessageObject("todayUpdate", identifier: "mainUpdate")
     }
 }

BigGulp/ViewControllers/CalendarViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import JTCalendar
 
 class CalendarViewController: UIViewController, JTCalendarDataSource {
 

BigGulp/ViewControllers/DrinkViewController+Animations.swift

@@ -1,3 +1,5 @@
+import pop
+
 extension DrinkViewController {
 
     func initAnimation() {

BigGulp/ViewControllers/DrinkViewController.swift

@@ -1,4 +1,8 @@
 import UIKit
+import DPMeterView
+import UICountingLabel
+import MMWormhole
+import AMPopTip
 
 class DrinkViewController: UIViewController, UIAlertViewDelegate {
 

BigGulp/ViewControllers/Onboarding/GulpsViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import pop
 
 class GulpsViewController: OnboardingViewController, UITextFieldDelegate {
 

BigGulp/ViewControllers/Onboarding/MeasureViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import pop
 
 class MeasureViewController: OnboardingViewController {
 

BigGulp/ViewControllers/Onboarding/NotificationViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AHKActionSheet
 
 class NotificationViewController: OnboardingViewController, UIActionSheetDelegate {
 

BigGulp/ViewControllers/Onboarding/OnboardingViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AMWaveTransition
 
 class OnboardingViewController: AMWaveViewController {
 

BigGulp/ViewControllers/SettingsViewController.swift

@@ -1,4 +1,5 @@
 import UIKit
+import AHKActionSheet
 
 class SettingsViewController: UITableViewController, UIAlertViewDelegate, UITextFieldDelegate {
 

BigGulpToday/TodayViewController+Animation.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import pop
 
 extension TodayViewController {
     func showConfirmButtons() {

BigGulpToday/TodayViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import NotificationCenter
+import MMWormhole
 
 class TodayViewController: UIViewController, NCWidgetProviding {
 

Podfile

@@ -1,26 +1,20 @@
 source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
 
-pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
 pod 'pop', '~> 1.0'
 pod 'AMPopTip', '~> 0.7'
 pod 'UICountingLabel', '~> 1.2'
 pod 'Realm', '~> 0.91'
-pod 'JTCalendar', git: 'git@github.com:andreamazz/JTCalendar.git', branch: 'develop'
 pod 'AMWaveTransition', '~> 0.5'
-pod 'AHKActionSheet', '~> 0.5'
 pod 'MMWormhole', '~> 1.1'
-pod 'GoogleAnalytics-iOS-SDK', '~> 3.10'
+pod 'AHKActionSheet', '~> 0.5'
+pod 'JTCalendar', git: 'git@github.com:andreamazz/JTCalendar.git', branch: 'develop'
+pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
 
-#target 'BigGulpTests', exclusive: true do
-#  pod 'Quick', git: 'https://github.com/Quick/Quick.git'
-#  pod 'Nimble', '~> 0.4'
-#
-## Had to duplicate these, check https://github.com/CocoaPods/CocoaPods/issues/2695
-#  pod 'DPMeterView', git: 'https://github.com/andreamazz/DPMeterView'
-#  pod 'pop', '~> 1.0'
-#  pod 'AMPopTip', '~> 0.7'
-#  pod 'UICountingLabel', '~> 1.2'
-#  pod 'JTCalendar', git: 'git@github.com:andreamazz/JTCalendar.git', branch: 'develop'
-#end
+target 'BigGulpTests', exclusive: true do
+  pod 'Quick'
+  pod 'Nimble'
+end
 
 inhibit_all_warnings!
+use_frameworks!