Skip to content

Dev Merge #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 44 commits into from
Jul 21, 2020
Merged

Dev Merge #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
fa6bffc
Quiet Hours
jonfawcett Jul 9, 2020
ceb9dcd
Prediction fix when using max hours and there aren't enough downloaded
jonfawcett Jul 10, 2020
6b8eb5e
Added:
Jul 10, 2020
46f2523
Remove alert row labels from iPad
jonfawcett Jul 13, 2020
8968e3c
Fix for freeAPS ms in bolus timestamp
jonfawcett Jul 13, 2020
b34b9b3
FreeAPS MS carb fix
jonfawcett Jul 13, 2020
d7fc666
Fix: not looping bg limits
jonfawcett Jul 13, 2020
9eea040
Fix: prediction colors
jonfawcett Jul 13, 2020
96099b8
Fix: errant carb entries
jonfawcett Jul 13, 2020
a7d3836
Added ShareClientExtension
Jul 13, 2020
662d20a
remove team id
Jul 13, 2020
a40ef6f
Merge pull request #67 from josep1972/dev
jonfawcett Jul 13, 2020
fa4499a
fixed a few typos
Jul 14, 2020
92e6958
Fix: add NONE to trend arrow
jonfawcett Jul 14, 2020
f5dd84e
Merge pull request #68 from josep1972/dev
jonfawcett Jul 16, 2020
274bd22
DexShare
jonfawcett Jul 16, 2020
b721872
Dexshare fix
jonfawcett Jul 16, 2020
fb319f1
Added:
jonfawcett Jul 16, 2020
ee65e61
Added:
jonfawcett Jul 16, 2020
ea86754
fix: clear info table
jonfawcett Jul 16, 2020
c62e4ad
fix: basal info table reload
jonfawcett Jul 16, 2020
07876ac
Function Added
Jul 17, 2020
18aae05
Fix: min zoom scale
jonfawcett Jul 17, 2020
e78cb4e
Sub views for settings
Jul 17, 2020
c40ab03
Add: enable/disable features or NS vs Dex
jonfawcett Jul 17, 2020
201c02e
Prepare to merge
Jul 17, 2020
96e0d62
Merge branch 'dexcom' into dev
josep1972 Jul 17, 2020
111d7d9
Merge pull request #3 from josep1972/dev
josep1972 Jul 17, 2020
494bbad
cleanup
Jul 17, 2020
54b4600
Merge branch 'dexcom' of https://github.com/josep1972/LoopFollow into…
Jul 17, 2020
f151993
Merge
Jul 17, 2020
1bee263
Fix for settings view controllers
Jul 18, 2020
200e7b9
ScaleX Fix
Jul 18, 2020
891752d
Fix quick typo
Jul 18, 2020
028873f
Merge pull request #70 from josep1972/dexcom
jonfawcett Jul 18, 2020
4ee21c3
Merge pull request #71 from jonfawcett/dexcom
jonfawcett Jul 18, 2020
1dca19a
Fix: watch haptic notification
jonfawcett Jul 18, 2020
20f04a5
Add: Pred Min-Max. Fix: infoTable Defaults
jonfawcett Jul 18, 2020
2f33f0e
Add: Show/hide NS settings. Fix Min Ago Calendar. Cleanup Watch/Carpl…
jonfawcett Jul 19, 2020
a2588b6
Remove debug tab
jonfawcett Jul 19, 2020
ec0b6bd
Add: show/hide Stats and Small Graph
jonfawcett Jul 19, 2020
c4075d7
Fix: BG Units prediction
jonfawcett Jul 19, 2020
6d590b4
Add: Small screen layout
jonfawcett Jul 19, 2020
6f8f927
Change: rename to Pred.
jonfawcett Jul 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions LoopFollow.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@

/* Begin PBXBuildFile section */
3F1335F351590E573D8E6962 /* Pods_LoopFollow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */; };
DD152D3B24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */; };
DD98F54424BCEFEE0007425A /* ShareClientExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */; };
DDCF979424C0D380002C9752 /* UIViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979324C0D380002C9752 /* UIViewExtension.swift */; };
DDCF979624C1443C002C9752 /* GeneralSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */; };
DDCF979824C1489C002C9752 /* GraphSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */; };
DDCF979A24C14DB4002C9752 /* WatchSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */; };
DDCF979C24C14EFB002C9752 /* DebugSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */; };
DDCF979E24C2382A002C9752 /* AppStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDCF979D24C2382A002C9752 /* AppStateController.swift */; };
FC16A97A24996673003D6245 /* NightScout.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A97924996673003D6245 /* NightScout.swift */; };
FC16A97B249966A3003D6245 /* AlarmSound.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */; };
FC16A97D24996747003D6245 /* Alarms.swift in Sources */ = {isa = PBXBuildFile; fileRef = FC16A97C24996747003D6245 /* Alarms.swift */; };
Expand Down Expand Up @@ -162,6 +170,14 @@
/* Begin PBXFileReference section */
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>"; };
A7D55B42A22051DAD69E89D0 /* Pods_LoopFollow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_LoopFollow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InfoDisplaySettingsViewController.swift; sourceTree = "<group>"; };
DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareClientExtension.swift; sourceTree = "<group>"; };
DDCF979324C0D380002C9752 /* UIViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewExtension.swift; sourceTree = "<group>"; };
DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralSettingsViewController.swift; sourceTree = "<group>"; };
DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphSettingsViewController.swift; sourceTree = "<group>"; };
DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchSettingsViewController.swift; sourceTree = "<group>"; };
DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugSettingsViewController.swift; sourceTree = "<group>"; };
DDCF979D24C2382A002C9752 /* AppStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppStateController.swift; sourceTree = "<group>"; };
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>"; };
FC16A97924996673003D6245 /* NightScout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NightScout.swift; sourceTree = "<group>"; };
FC16A97C24996747003D6245 /* Alarms.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alarms.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -350,6 +366,15 @@
path = Pods;
sourceTree = "<group>";
};
DD98F54224BCEF190007425A /* Extensions */ = {
isa = PBXGroup;
children = (
DD98F54324BCEFEE0007425A /* ShareClientExtension.swift */,
DDCF979324C0D380002C9752 /* UIViewExtension.swift */,
);
path = Extensions;
sourceTree = "<group>";
};
FC16A97624995FEE003D6245 /* Application */ = {
isa = PBXGroup;
children = (
Expand All @@ -364,6 +389,7 @@
FC16A9782499657E003D6245 /* Controllers */ = {
isa = PBXGroup;
children = (
DDCF979D24C2382A002C9752 /* AppStateController.swift */,
FC7CE589248ABEA3001F83B8 /* AlarmSound.swift */,
FC16A97924996673003D6245 /* NightScout.swift */,
FC16A97C24996747003D6245 /* Alarms.swift */,
Expand Down Expand Up @@ -513,6 +539,7 @@
FC8DEEE62485D1ED0075863F /* Info.plist */,
FC7CE59A248D334B001F83B8 /* Resources */,
FCC68871248A736700A0279D /* ViewControllers */,
DD98F54224BCEF190007425A /* Extensions */,
FC16A9782499657E003D6245 /* Controllers */,
FCC688542489367300A0279D /* helpers */,
FCC68872248A748A00A0279D /* Models */,
Expand Down Expand Up @@ -578,6 +605,11 @@
FCFEECA1248857A600402A7F /* SettingsViewController.swift */,
FCC6884F248935D800A0279D /* AlarmViewController.swift */,
FC7CE59E248D8D23001F83B8 /* SnoozeViewController.swift */,
DD152D3A24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift */,
DDCF979524C1443C002C9752 /* GeneralSettingsViewController.swift */,
DDCF979724C1489C002C9752 /* GraphSettingsViewController.swift */,
DDCF979924C14DB4002C9752 /* WatchSettingsViewController.swift */,
DDCF979B24C14EFB002C9752 /* DebugSettingsViewController.swift */,
);
path = ViewControllers;
sourceTree = "<group>";
Expand Down Expand Up @@ -824,7 +856,9 @@
FCC68850248935D800A0279D /* AlarmViewController.swift in Sources */,
FC7CE59F248D8D23001F83B8 /* SnoozeViewController.swift in Sources */,
FCC6886724898F8000A0279D /* UserDefaultsValue.swift in Sources */,
DDCF979E24C2382A002C9752 /* AppStateController.swift in Sources */,
FC97881E2485969B00A7906C /* NightScoutViewController.swift in Sources */,
DDCF979824C1489C002C9752 /* GraphSettingsViewController.swift in Sources */,
FC3AE7B5249E8E0E00AAE1E0 /* LoopFollow.xcdatamodeld in Sources */,
FCC6886F2489A53800A0279D /* AppConstants.swift in Sources */,
FC16A97A24996673003D6245 /* NightScout.swift in Sources */,
Expand All @@ -833,20 +867,26 @@
FC16A97B249966A3003D6245 /* AlarmSound.swift in Sources */,
FCFEECA2248857A600402A7F /* SettingsViewController.swift in Sources */,
FCFEECA02488157B00402A7F /* Chart.swift in Sources */,
DDCF979424C0D380002C9752 /* UIViewExtension.swift in Sources */,
FCEF87AC24A141A700AE6FA0 /* bgUnits.swift in Sources */,
FC1BDD3224A2585C001B652C /* DataStructs.swift in Sources */,
FCC6886524898EEE00A0279D /* UserDefaults.swift in Sources */,
FC16A97F249969E2003D6245 /* Graphs.swift in Sources */,
DD152D3B24C01B2300361FA2 /* InfoDisplaySettingsViewController.swift in Sources */,
DDCF979C24C14EFB002C9752 /* DebugSettingsViewController.swift in Sources */,
FC97881C2485969B00A7906C /* MainViewController.swift in Sources */,
DDCF979624C1443C002C9752 /* GeneralSettingsViewController.swift in Sources */,
FCC0FAC224922A22003E610E /* DictionaryKeyPath.swift in Sources */,
FC9788182485969B00A7906C /* AppDelegate.swift in Sources */,
FCC6886B24898FD800A0279D /* ObservationToken.swift in Sources */,
DD98F54424BCEFEE0007425A /* ShareClientExtension.swift in Sources */,
FCC6886D2489909D00A0279D /* AnyConvertible.swift in Sources */,
FC97881A2485969B00A7906C /* SceneDelegate.swift in Sources */,
FCD49B6C24AA536E007879DC /* DebugViewController.swift in Sources */,
FC1BDD2B24A22650001B652C /* Stats.swift in Sources */,
FC1BDD2D24A23204001B652C /* StatsView.swift in Sources */,
FCE537BC249A4D7D00F80BF8 /* carbBolusArrays.swift in Sources */,
DDCF979A24C14DB4002C9752 /* WatchSettingsViewController.swift in Sources */,
FC16A98124996C07003D6245 /* DateTime.swift in Sources */,
FC3CAB022493B6220068A152 /* BackgroundTaskAudio.swift in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion LoopFollow.xcodeproj/xcuserdata/jon.xcuserdatad/xcschemes/xcschememanagement.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>LoopFollow.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
<integer>4</integer>
</dict>
</dict>
</dict>
Expand Down
15 changes: 8 additions & 7 deletions LoopFollow/Application/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?
let notificationCenter = UNUserNotificationCenter.current()

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.

Expand All @@ -30,12 +30,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
let store = EKEventStore()
store.requestAccess(to: .event) {(granted, error) in
if !granted { return }
}

return true
}

if !granted { return }
}

return true
}


func applicationWillTerminate(_ application: UIApplication) {
if UserDefaultsRepository.alertAppInactive.value {
AlarmSound.setSoundFile(str: "Alarm_Buzzer")
Expand Down
Loading