Skip to content

Commit

Permalink
version 4.4.0 - build 4104
Browse files Browse the repository at this point in the history
  • Loading branch information
@JohanDegraeve
JohanDegraeve committed Oct 10, 2020
1 parent 03381e6 commit e1b92a6
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
16 changes: 8 additions & 8 deletions xdrip.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3446,7 +3446,7 @@
CODE_SIGN_ENTITLEMENTS = "xDrip4iOS Widget/xDrip4iOS Widget.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4103;
CURRENT_PROJECT_VERSION = 4104;
DEVELOPMENT_TEAM = RNX44PP998;
INFOPLIST_FILE = "xDrip4iOS Widget/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand All @@ -3455,7 +3455,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.3.2;
MARKETING_VERSION = 4.4.0;
PRODUCT_BUNDLE_IDENTIFIER = "net.johandegraeve.xdripswift.xDrip4iOS-Widget";
PRODUCT_NAME = xDrip4iOS;
SKIP_INSTALL = YES;
Expand All @@ -3471,7 +3471,7 @@
CODE_SIGN_ENTITLEMENTS = "xDrip4iOS Widget/xDrip4iOS Widget.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4103;
CURRENT_PROJECT_VERSION = 4104;
DEVELOPMENT_TEAM = RNX44PP998;
INFOPLIST_FILE = "xDrip4iOS Widget/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
Expand All @@ -3480,7 +3480,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.3.2;
MARKETING_VERSION = 4.4.0;
PRODUCT_BUNDLE_IDENTIFIER = "net.johandegraeve.xdripswift.xDrip4iOS-Widget";
PRODUCT_NAME = xDrip4iOS;
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -3620,15 +3620,15 @@
CODE_SIGN_ENTITLEMENTS = xdrip/xdrip.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4103;
CURRENT_PROJECT_VERSION = 4104;
DEVELOPMENT_TEAM = RNX44PP998;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.3.2;
MARKETING_VERSION = 4.4.0;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -3650,15 +3650,15 @@
CODE_SIGN_ENTITLEMENTS = xdrip/xdrip.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4103;
CURRENT_PROJECT_VERSION = 4104;
DEVELOPMENT_TEAM = RNX44PP998;
INFOPLIST_FILE = "$(SRCROOT)/xdrip/Supporting Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.3.2;
MARKETING_VERSION = 4.4.0;
PRODUCT_BUNDLE_IDENTIFIER = net.johandegraeve.xdripswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
22 changes: 11 additions & 11 deletions xdrip/View Controllers/Root View Controller/RootViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ final class RootViewController: UIViewController {

@IBAction func chartPanGestureRecognizerAction(_ sender: UIPanGestureRecognizer) {

glucoseChartManager.handleUIGestureRecognizer(recognizer: sender, chartOutlet: chartOutlet, completionHandler: {
/* glucoseChartManager.handleUIGestureRecognizer(recognizer: sender, chartOutlet: chartOutlet, completionHandler: {

// user has been panning, if chart is panned backward, then need to set valueLabel to value of latest chartPoint shown in the chart, and minutesAgo text to timeStamp of latestChartPoint
if self.glucoseChartManager.chartIsPannedBackward {
Expand Down Expand Up @@ -100,7 +100,7 @@ final class RootViewController: UIViewController {

}

})
})*/

}

Expand All @@ -110,7 +110,7 @@ final class RootViewController: UIViewController {

// this one needs trigger in case user has panned, chart is decelerating, user clicks to stop the decleration, call to handleUIGestureRecognizer will stop the deceleration
// there's no completionhandler needed because the call in chartPanGestureRecognizerAction to handleUIGestureRecognizer already includes a completionhandler
glucoseChartManager.handleUIGestureRecognizer(recognizer: sender, chartOutlet: chartOutlet, completionHandler: nil)
// glucoseChartManager.handleUIGestureRecognizer(recognizer: sender, chartOutlet: chartOutlet, completionHandler: nil)

}

Expand Down Expand Up @@ -196,7 +196,7 @@ final class RootViewController: UIViewController {
private var bluetoothPeripheralManager: BluetoothPeripheralManager?

/// manage glucose chart
private var glucoseChartManager: GlucoseChartManager!
private var glucoseChartManager: GlucoseChartManager?

/// dateformatter for minutesLabelOutlet, when user is panning the chart
private let dateTimeFormatterForMinutesLabelWhenPanning: DateFormatter = {
Expand Down Expand Up @@ -231,7 +231,7 @@ final class RootViewController: UIViewController {
override func didReceiveMemoryWarning() {
super.didReceiveMemoryWarning()
// never seen it triggered, copied that from Loop
glucoseChartManager.didReceiveMemoryWarning()
// glucoseChartManager.didReceiveMemoryWarning()

}

Expand Down Expand Up @@ -267,7 +267,7 @@ final class RootViewController: UIViewController {
changeButtonsStatusTo(enabled: UserDefaults.standard.isMaster)

// initialize glucoseChartManager
glucoseChartManager = GlucoseChartManager(chartLongPressGestureRecognizer: chartLongPressGestureRecognizerOutlet)
//glucoseChartManager = GlucoseChartManager(chartLongPressGestureRecognizer: chartLongPressGestureRecognizerOutlet)

// Setup Core Data Manager - setting up coreDataManager happens asynchronously
// completion handler is called when finished. This gives the app time to already continue setup which is independent of coredata, like initializing the views
Expand All @@ -279,7 +279,7 @@ final class RootViewController: UIViewController {
self.houseKeeper?.doAppStartUpHouseKeeping()

// glucoseChartManager still needs the reference to coreDataManager
self.glucoseChartManager.coreDataManager = self.coreDataManager
// self.glucoseChartManager.coreDataManager = self.coreDataManager

// update label texts, minutes ago, diff and value
self.updateLabelsAndChart(overrideApplicationState: true)
Expand Down Expand Up @@ -357,9 +357,9 @@ final class RootViewController: UIViewController {
setupAVAudioSession()

// initialize chartGenerator in chartOutlet
self.chartOutlet.chartGenerator = { [weak self] (frame) in
/* self.chartOutlet.chartGenerator = { [weak self] (frame) in
return self?.glucoseChartManager.glucoseChartWithFrame(frame)?.view
}
}*/

// user may have long pressed the value label, so the screen will not lock, when going back to background, set isIdleTimerDisabled back to false
ApplicationManager.shared.addClosureToRunWhenAppDidEnterBackground(key: applicationManagerKeyIsIdleTimerDisabled, closure: {
Expand Down Expand Up @@ -807,7 +807,7 @@ final class RootViewController: UIViewController {
/// will update the chart with endDate = currentDate
private func updateChartWithResetEndDate() {

glucoseChartManager.updateGlucoseChartPoints(endDate: Date(), startDate: nil, chartOutlet: chartOutlet, completionHandler: nil)
// glucoseChartManager.updateGlucoseChartPoints(endDate: Date(), startDate: nil, chartOutlet: chartOutlet, completionHandler: nil)

}

Expand Down Expand Up @@ -1176,7 +1176,7 @@ final class RootViewController: UIViewController {
guard UIApplication.shared.applicationState == .active || overrideApplicationState else {return}

// check if chart is currently panned back in time, in that case we don't update the labels
guard !glucoseChartManager.chartIsPannedBackward else {return}
// guard !glucoseChartManager.chartIsPannedBackward else {return}

// check that bgReadingsAccessor exists, otherwise return - this happens if updateLabelsAndChart is called from viewDidload at app launch
guard let bgReadingsAccessor = bgReadingsAccessor else {return}
Expand Down

0 comments on commit e1b92a6

Please sign in to comment.