Skip to content

Commit 65c01ca

Browse files
jonfawcettjonfawcett
authored
Merge pull request #75 from jonfawcett/dev
Dev Merge
2 parents 3289e2e + 6f8f927 commit 65c01ca

File tree

55 files changed

+3756
-1964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3756
-1964
lines changed

‎LoopFollow.xcodeproj/project.pbxproj‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@
88

99
/* Begin PBXBuildFile section */
1010
3F1335F351590E573D8E6962 /* Pods_LoopFollow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */; };
11+
DD152D3B24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */; };
12+
DD98F54424BCEFEE0007425A /* ShareClientExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */; };
13+
DDCF979424C0D380002C9752 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979324C0D380002C9752 /* UIViewExtension.swift */; };
14+
DDCF979624C1443C002C9752 /* GeneralSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */; };
15+
DDCF979824C1489C002C9752 /* GraphSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */; };
16+
DDCF979A24C14DB4002C9752 /* WatchSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */; };
17+
DDCF979C24C14EFB002C9752 /* DebugSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */; };
18+
DDCF979E24C2382A002C9752 /* AppStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979D24C2382A002C9752 /* AppStateController.swift */; };
1119
FC16A97A24996673003D6245 /* NightScout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A97924996673003D6245 /* NightScout.swift */; };
1220
FC16A97B249966A3003D6245 /* AlarmSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */; };
1321
FC16A97D24996747003D6245 /* Alarms.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A97C24996747003D6245 /* Alarms.swift */; };
@@ -162,6 +170,14 @@
162170
/* Begin PBXFileReference section */
163171
059B0FA59AABFE72FE13DDDA /* Pods-LoopFollow.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LoopFollow.release.xcconfig"; path = "Target Support Files/Pods-LoopFollow/Pods-LoopFollow.release.xcconfig"; sourceTree = "<group>"; };
164172
A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LoopFollow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
173+
DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoDisplaySettingsViewController.swift; sourceTree = "<group>"; };
174+
DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareClientExtension.swift; sourceTree = "<group>"; };
175+
DDCF979324C0D380002C9752 /* UIViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewExtension.swift; sourceTree = "<group>"; };
176+
DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsViewController.swift; sourceTree = "<group>"; };
177+
DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphSettingsViewController.swift; sourceTree = "<group>"; };
178+
DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSettingsViewController.swift; sourceTree = "<group>"; };
179+
DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugSettingsViewController.swift; sourceTree = "<group>"; };
180+
DDCF979D24C2382A002C9752 /* AppStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateController.swift; sourceTree = "<group>"; };
165181
ECA3EFB4037410B4973BB632 /* Pods-LoopFollow.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LoopFollow.debug.xcconfig"; path = "Target Support Files/Pods-LoopFollow/Pods-LoopFollow.debug.xcconfig"; sourceTree = "<group>"; };
166182
FC16A97924996673003D6245 /* NightScout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightScout.swift; sourceTree = "<group>"; };
167183
FC16A97C24996747003D6245 /* Alarms.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alarms.swift; sourceTree = "<group>"; };
@@ -350,6 +366,15 @@
350366
path = Pods;
351367
sourceTree = "<group>";
352368
};
369+
DD98F54224BCEF190007425A /* Extensions */ = {
370+
isa = PBXGroup;
371+
children = (
372+
DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */,
373+
DDCF979324C0D380002C9752 /* UIViewExtension.swift */,
374+
);
375+
path = Extensions;
376+
sourceTree = "<group>";
377+
};
353378
FC16A97624995FEE003D6245 /* Application */ = {
354379
isa = PBXGroup;
355380
children = (
@@ -364,6 +389,7 @@
364389
FC16A9782499657E003D6245 /* Controllers */ = {
365390
isa = PBXGroup;
366391
children = (
392+
DDCF979D24C2382A002C9752 /* AppStateController.swift */,
367393
FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */,
368394
FC16A97924996673003D6245 /* NightScout.swift */,
369395
FC16A97C24996747003D6245 /* Alarms.swift */,
@@ -513,6 +539,7 @@
513539
FC8DEEE62485D1ED0075863F /* Info.plist */,
514540
FC7CE59A248D334B001F83B8 /* Resources */,
515541
FCC68871248A736700A0279D /* ViewControllers */,
542+
DD98F54224BCEF190007425A /* Extensions */,
516543
FC16A9782499657E003D6245 /* Controllers */,
517544
FCC688542489367300A0279D /* helpers */,
518545
FCC68872248A748A00A0279D /* Models */,
@@ -578,6 +605,11 @@
578605
FCFEECA1248857A600402A7F /* SettingsViewController.swift */,
579606
FCC6884F248935D800A0279D /* AlarmViewController.swift */,
580607
FC7CE59E248D8D23001F83B8 /* SnoozeViewController.swift */,
608+
DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */,
609+
DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */,
610+
DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */,
611+
DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */,
612+
DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */,
581613
);
582614
path = ViewControllers;
583615
sourceTree = "<group>";
@@ -824,7 +856,9 @@
824856
FCC68850248935D800A0279D /* AlarmViewController.swift in Sources */,
825857
FC7CE59F248D8D23001F83B8 /* SnoozeViewController.swift in Sources */,
826858
FCC6886724898F8000A0279D /* UserDefaultsValue.swift in Sources */,
859+
DDCF979E24C2382A002C9752 /* AppStateController.swift in Sources */,
827860
FC97881E2485969B00A7906C /* NightScoutViewController.swift in Sources */,
861+
DDCF979824C1489C002C9752 /* GraphSettingsViewController.swift in Sources */,
828862
FC3AE7B5249E8E0E00AAE1E0 /* LoopFollow.xcdatamodeld in Sources */,
829863
FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */,
830864
FC16A97A24996673003D6245 /* NightScout.swift in Sources */,
@@ -833,20 +867,26 @@
833867
FC16A97B249966A3003D6245 /* AlarmSound.swift in Sources */,
834868
FCFEECA2248857A600402A7F /* SettingsViewController.swift in Sources */,
835869
FCFEECA02488157B00402A7F /* Chart.swift in Sources */,
870+
DDCF979424C0D380002C9752 /* UIViewExtension.swift in Sources */,
836871
FCEF87AC24A141A700AE6FA0 /* bgUnits.swift in Sources */,
837872
FC1BDD3224A2585C001B652C /* DataStructs.swift in Sources */,
838873
FCC6886524898EEE00A0279D /* UserDefaults.swift in Sources */,
839874
FC16A97F249969E2003D6245 /* Graphs.swift in Sources */,
875+
DD152D3B24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift in Sources */,
876+
DDCF979C24C14EFB002C9752 /* DebugSettingsViewController.swift in Sources */,
840877
FC97881C2485969B00A7906C /* MainViewController.swift in Sources */,
878+
DDCF979624C1443C002C9752 /* GeneralSettingsViewController.swift in Sources */,
841879
FCC0FAC224922A22003E610E /* DictionaryKeyPath.swift in Sources */,
842880
FC9788182485969B00A7906C /* AppDelegate.swift in Sources */,
843881
FCC6886B24898FD800A0279D /* ObservationToken.swift in Sources */,
882+
DD98F54424BCEFEE0007425A /* ShareClientExtension.swift in Sources */,
844883
FCC6886D2489909D00A0279D /* AnyConvertible.swift in Sources */,
845884
FC97881A2485969B00A7906C /* SceneDelegate.swift in Sources */,
846885
FCD49B6C24AA536E007879DC /* DebugViewController.swift in Sources */,
847886
FC1BDD2B24A22650001B652C /* Stats.swift in Sources */,
848887
FC1BDD2D24A23204001B652C /* StatsView.swift in Sources */,
849888
FCE537BC249A4D7D00F80BF8 /* carbBolusArrays.swift in Sources */,
889+
DDCF979A24C14DB4002C9752 /* WatchSettingsViewController.swift in Sources */,
850890
FC16A98124996C07003D6245 /* DateTime.swift in Sources */,
851891
FC3CAB022493B6220068A152 /* BackgroundTaskAudio.swift in Sources */,
852892
);

‎LoopFollow.xcodeproj/xcuserdata/jon.xcuserdatad/xcschemes/xcschememanagement.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>LoopFollow.xcscheme_^#shared#^_</key>
88
<dict>
99
<key>orderHint</key>
10-
<integer>3</integer>
10+
<integer>4</integer>
1111
</dict>
1212
</dict>
1313
</dict>

‎LoopFollow/Application/AppDelegate.swift‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1616

1717
var window: UIWindow?
1818
let notificationCenter = UNUserNotificationCenter.current()
19-
19+
2020
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
2121
// Override point for customization after application launch.
2222

@@ -30,12 +30,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3030
}
3131
let store = EKEventStore()
3232
store.requestAccess(to: .event) {(granted, error) in
33-
if !granted { return }
34-
}
35-
36-
return true
37-
}
38-
33+
if !granted { return }
34+
}
35+
36+
return true
37+
}
38+
39+
3940
func applicationWillTerminate(_ application: UIApplication) {
4041
if UserDefaultsRepository.alertAppInactive.value {
4142
AlarmSound.setSoundFile(str: "Alarm_Buzzer")

0 commit comments

Comments
 (0)