From 84a76e943f16eb7f1aa8ce89e050cffe4676c96a Mon Sep 17 00:00:00 2001
From: bjornoleh <63544115+bjornoleh@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:36:24 +0100
Subject: [PATCH 01/87] NS-style blue temp basal icicles fill
cherry-picked from https://github.com/mountrcg/freeaps/commit/437ee2edd50acd8844e546ab9c108614f27ca93e
---
.../Colors/Basal.colorset/Contents.json | 9 ------
.../Colors/TempBasal.colorset/Contents.json | 28 ++++---------------
2 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json b/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
index 7aae3ba200..39e40a2a66 100644
--- a/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
+++ b/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
@@ -19,15 +19,6 @@
"value" : "dark"
}
],
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "1.000",
- "green" : "1.000",
- "red" : "1.000"
- }
- },
"idiom" : "universal"
}
],
diff --git a/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json b/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
index b40335c11b..3f64e4c22a 100644
--- a/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
+++ b/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
@@ -2,30 +2,12 @@
"colors" : [
{
"color" : {
- "color-space" : "srgb",
+ "color-space" : "display-p3",
"components" : {
- "alpha" : "0.500",
- "blue" : "0.976",
- "green" : "0.839",
- "red" : "0.635"
- }
- },
- "idiom" : "universal"
- },
- {
- "appearances" : [
- {
- "appearance" : "luminosity",
- "value" : "dark"
- }
- ],
- "color" : {
- "color-space" : "srgb",
- "components" : {
- "alpha" : "1.000",
- "blue" : "0.988",
- "green" : "0.588",
- "red" : "0.118"
+ "alpha" : "0.350",
+ "blue" : "0.608",
+ "green" : "0.804",
+ "red" : "0.529"
}
},
"idiom" : "universal"
From db3a2cd4402ead200f2f12f4ba23a7c3f9e3d3b7 Mon Sep 17 00:00:00 2001
From: bjornoleh <63544115+bjornoleh@users.noreply.github.com>
Date: Fri, 24 Mar 2023 16:36:24 +0100
Subject: [PATCH 02/87] Revert "NS-style blue temp basal icicles fill"
This reverts commit 84a76e943f16eb7f1aa8ce89e050cffe4676c96a.
---
.../Colors/Basal.colorset/Contents.json | 9 ++++++
.../Colors/TempBasal.colorset/Contents.json | 28 +++++++++++++++----
2 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json b/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
index 39e40a2a66..7aae3ba200 100644
--- a/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
+++ b/FreeAPS/Resources/Assets.xcassets/Colors/Basal.colorset/Contents.json
@@ -19,6 +19,15 @@
"value" : "dark"
}
],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "1.000",
+ "green" : "1.000",
+ "red" : "1.000"
+ }
+ },
"idiom" : "universal"
}
],
diff --git a/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json b/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
index 3f64e4c22a..b40335c11b 100644
--- a/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
+++ b/FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json
@@ -2,12 +2,30 @@
"colors" : [
{
"color" : {
- "color-space" : "display-p3",
+ "color-space" : "srgb",
"components" : {
- "alpha" : "0.350",
- "blue" : "0.608",
- "green" : "0.804",
- "red" : "0.529"
+ "alpha" : "0.500",
+ "blue" : "0.976",
+ "green" : "0.839",
+ "red" : "0.635"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0.988",
+ "green" : "0.588",
+ "red" : "0.118"
}
},
"idiom" : "universal"
From 1ed821864af5eaee65417ea671ee5a9226c90cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20B=20M=C3=A5rtensson?=
<53905247+Jon-b-m@users.noreply.github.com>
Date: Sat, 25 Mar 2023 19:26:38 +0100
Subject: [PATCH 03/87] Version 1.1.4 (#12)
* Profile Override
I created profiles for iAPS, that is profile overrides. Using this is similar to using an override in Loop, but better. You can set a duration or enable the Profile Override indefinitely (from now on until you disable it).
All Profile Basal rates, scheduled ISF:s and CR:s will be adjusted. Your total insulin delivered will be adjusted with this override. Basal adjusted and ISF+CR inversely adjusted with set percentage.
Current Overide % and time remaining of override will be displayed in info panel in main view.
New Icons!
Icons created by our designer Tom Barrows.
* Simplify TT Slider and auto-set Half Basal Target settings.
* New Default icon (less blurry).
*Bump version
* Fix for default app name
* UI Team feedback (Tom Barrows). Simplify text for TT slider
* Avoid truncating in info panel for overrides.
---
Config.xcconfig | 4 +-
.../Core_Data.xcdatamodel/contents | 9 +-
.../AppIcon.appiconset/Contents.json | 45 ++++++-
FreeAPS.xcodeproj/project.pbxproj | 64 +++++++--
.../xcshareddata/swiftpm/Package.resolved | 14 +-
.../AppIcon.appiconset/1024 1.png | Bin 109003 -> 0 bytes
.../AppIcon.appiconset/1024 2.png | Bin 109003 -> 0 bytes
.../AppIcon.appiconset/1024.png | Bin 109003 -> 0 bytes
.../AppIcon.appiconset/128.png | Bin 12918 -> 0 bytes
.../Assets.xcassets/AppIcon.appiconset/16.png | Bin 836 -> 0 bytes
.../AppIcon.appiconset/256.png | Bin 32534 -> 0 bytes
.../Assets.xcassets/AppIcon.appiconset/32.png | Bin 2099 -> 0 bytes
.../AppIcon.appiconset/512.png | Bin 82218 -> 0 bytes
.../Assets.xcassets/AppIcon.appiconset/64.png | Bin 5229 -> 0 bytes
.../AppIcon.appiconset/AppIcon117x117@2x.png | Bin 13869 -> 0 bytes
.../AppIcon.appiconset/AppIcon129x129@2x.png | Bin 13869 -> 0 bytes
.../AppIcon.appiconset/AppIcon33x33@2x.png | Bin 6822 -> 0 bytes
.../AppIcon.appiconset/AppIcon46x46@2x.png | Bin 10853 -> 0 bytes
.../AppIcon.appiconset/AppIcon51x51@2x.png | Bin 12713 -> 0 bytes
.../AppIcon.appiconset/AppIcon54x54@2x.png | Bin 13869 -> 0 bytes
.../AppIcon.appiconset/Contents.json | 80 -----------
.../AppIcon_BW.appiconset/1024_-1024 1.png | Bin 102310 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-1024.png | Bin 102310 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-1025.png | Bin 102310 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-128.png | Bin 10305 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-16.png | Bin 1739 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-256.png | Bin 23297 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-257.png | Bin 23297 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-32.png | Bin 2705 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-33.png | Bin 2705 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-512.png | Bin 54347 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-513.png | Bin 54347 -> 0 bytes
.../AppIcon_BW.appiconset/1024_-64.png | Bin 5016 -> 0 bytes
.../AppIcon_BW.appiconset/Contents.json | 80 -----------
.../iAPS.appiconset/Contents.json | 20 +++
.../iAPS.appiconset/iAPS Text 1.png | Bin 0 -> 677627 bytes
.../iAPS.appiconset/iAPS Text.png | Bin 0 -> 677627 bytes
.../iAPS_Black.appiconset/Contents.json | 20 +++
.../iAPS_Black.appiconset/iAPS Icon2 1.png | Bin 0 -> 92778 bytes
.../iAPS_Black.appiconset/iAPS Icon2.png | Bin 0 -> 92778 bytes
.../iAPS_Black_Black.appiconset/Contents.json | 20 +++
.../iAPS Icon4 1.png | Bin 0 -> 36254 bytes
.../iAPS Icon4.png | Bin 0 -> 36254 bytes
.../iAPS_Clean.appiconset/Contents.json | 20 +++
.../iAPS_Clean.appiconset/Logo_Pink 1.png | Bin 0 -> 220589 bytes
.../iAPS_Clean.appiconset/Logo_Pink.png | Bin 0 -> 220589 bytes
.../iAPS_Glow_BG.appiconset/Contents.json | 20 +++
.../iAPS_Glow_BG.appiconset/iAPS Icon1 1.png | Bin 0 -> 680913 bytes
.../iAPS_Glow_BG.appiconset/iAPS Icon1.png | Bin 0 -> 680913 bytes
.../iAPS_Gray.appiconset/Contents.json | 20 +++
.../iAPS Pump_Bevel 1.png | Bin 0 -> 736425 bytes
.../iAPS_Gray.appiconset/iAPS Pump_Bevel.png | Bin 0 -> 736425 bytes
.../iAPS_Gray_Flat.appiconset/Contents.json | 20 +++
.../iAPS Pump_Black 1.png | Bin 0 -> 105305 bytes
.../iAPS Pump_Black.png | Bin 0 -> 105305 bytes
.../Contents.json | 20 +++
.../iAPS Pump_Bevel2_Black 1.png | Bin 0 -> 623250 bytes
.../iAPS Pump_Bevel2_Black.png | Bin 0 -> 623250 bytes
.../iAPS_Loop.appiconset/Contents.json | 20 +++
.../iAPS_Loop.appiconset/imageLoop 1.png | Bin 0 -> 633229 bytes
.../iAPS_Loop.appiconset/imageLoop.png | Bin 0 -> 633229 bytes
.../iAPS_Loop_Text.appiconset/Contents.json | 20 +++
.../iAPS_Loop_Text.appiconset/image 1.png | Bin 0 -> 638766 bytes
.../iAPS_Loop_Text.appiconset/image.png | Bin 0 -> 638766 bytes
.../Contents.json | 20 +++
.../iAPS Pump_Bevel2_Transparent.png | Bin 0 -> 781336 bytes
.../iAPS_NoButtons_Gray1024x1024.png | Bin 0 -> 1011527 bytes
.../iAPS_Purple.appiconset/Contents.json | 20 +++
.../iAPS Pump_FlatGradient 1.png | Bin 0 -> 299972 bytes
.../iAPS Pump_FlatGradient.png | Bin 0 -> 299972 bytes
.../iAPS_Purple_BG.appiconset/Contents.json | 20 +++
.../iAPS Icon3 1.png | Bin 0 -> 620440 bytes
.../iAPS_Purple_BG.appiconset/iAPS Icon3.png | Bin 0 -> 620440 bytes
.../Contents.json | 20 +++
.../iAPS Pump_White 1.png | Bin 0 -> 107034 bytes
.../iAPS Pump_White.png | Bin 0 -> 107034 bytes
.../iAPS_White_BG.appiconset/Contents.json | 20 +++
.../iAPS_White_BG.appiconset/iAPS Icon5 1.png | Bin 0 -> 127627 bytes
.../iAPS_White_BG.appiconset/iAPS Icon5.png | Bin 0 -> 127627 bytes
FreeAPS/Resources/Info.plist | 2 +
.../javascript/bundle/determine-basal.js | 2 +-
.../javascript/prepare/determine-basal.js | 12 +-
FreeAPS/Sources/APS/APSManager.swift | 125 ++++++++++++++++--
FreeAPS/Sources/APS/OpenAPS/Constants.swift | 2 +-
FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift | 8 +-
FreeAPS/Sources/Application/FreeAPSApp.swift | 1 -
...D_averages.swift => Oref2_variables.swift} | 26 +++-
.../AddTempTargetStateModel.swift | 12 +-
.../View/AddTempTargetRootView.swift | 49 ++++---
.../Modules/Home/View/HomeRootView.swift | 26 ++++
.../OverrideProfilesDataFlow.swift | 5 +
.../OverrideProfilesProvider.swift | 3 +
.../OverrideProfilesStateModel.swift | 59 +++++++++
.../View/OverrideProfilesRootView.swift | 107 +++++++++++++++
.../Settings/View/SettingsRootView.swift | 1 +
FreeAPS/Sources/Router/Screen.swift | 3 +
FreeAPSWatch/Info.plist | 10 ++
README.md | 2 +-
README_RU.md | 88 ------------
99 files changed, 815 insertions(+), 324 deletions(-)
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024 1.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024 2.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/128.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/16.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/256.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/32.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/512.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/64.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon117x117@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon129x129@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon33x33@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon46x46@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon51x51@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/AppIcon54x54@2x.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-1024 1.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-1024.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-1025.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-128.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-16.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-256.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-257.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-32.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-33.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-512.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-513.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/1024_-64.png
delete mode 100644 FreeAPS/Resources/Assets.xcassets/AppIcon_BW.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS.appiconset/iAPS Text 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS.appiconset/iAPS Text.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black.appiconset/iAPS Icon2 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black.appiconset/iAPS Icon2.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black_Black.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black_Black.appiconset/iAPS Icon4 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Black_Black.appiconset/iAPS Icon4.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Clean.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Clean.appiconset/Logo_Pink 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Clean.appiconset/Logo_Pink.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Glow_BG.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Glow_BG.appiconset/iAPS Icon1 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Glow_BG.appiconset/iAPS Icon1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray.appiconset/iAPS Pump_Bevel 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray.appiconset/iAPS Pump_Bevel.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_Flat.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_Flat.appiconset/iAPS Pump_Black 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_Flat.appiconset/iAPS Pump_Black.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_No_Buttons_BBG.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_No_Buttons_BBG.appiconset/iAPS Pump_Bevel2_Black 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Gray_No_Buttons_BBG.appiconset/iAPS Pump_Bevel2_Black.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop.appiconset/imageLoop 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop.appiconset/imageLoop.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop_Text.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop_Text.appiconset/image 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Loop_Text.appiconset/image.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_NoButtons_Gray_White_BG.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_NoButtons_Gray_White_BG.appiconset/iAPS Pump_Bevel2_Transparent.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_NoButtons_Gray_White_BG.appiconset/iAPS_NoButtons_Gray1024x1024.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple.appiconset/iAPS Pump_FlatGradient 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple.appiconset/iAPS Pump_FlatGradient.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple_BG.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple_BG.appiconset/iAPS Icon3 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_Purple_BG.appiconset/iAPS Icon3.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_WhiteAndGray.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_WhiteAndGray.appiconset/iAPS Pump_White 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_WhiteAndGray.appiconset/iAPS Pump_White.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_White_BG.appiconset/Contents.json
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_White_BG.appiconset/iAPS Icon5 1.png
create mode 100644 FreeAPS/Resources/Assets.xcassets/iAPS_White_BG.appiconset/iAPS Icon5.png
rename FreeAPS/Sources/Models/{TDD_averages.swift => Oref2_variables.swift} (51%)
create mode 100644 FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesDataFlow.swift
create mode 100644 FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesProvider.swift
create mode 100644 FreeAPS/Sources/Modules/OverrideProfilesConfig/OverrideProfilesStateModel.swift
create mode 100644 FreeAPS/Sources/Modules/OverrideProfilesConfig/View/OverrideProfilesRootView.swift
create mode 100644 FreeAPSWatch/Info.plist
delete mode 100644 README_RU.md
diff --git a/Config.xcconfig b/Config.xcconfig
index 812177adc8..e9ff9ec401 100644
--- a/Config.xcconfig
+++ b/Config.xcconfig
@@ -1,11 +1,11 @@
APP_DISPLAY_NAME = iAPS
-APP_VERSION = 1.1.2
+APP_VERSION = 1.1.4
APP_BUILD_NUMBER = 1
COPYRIGHT_NOTICE =
DEVELOPER_TEAM = ##TEAM_ID##
BUNDLE_IDENTIFIER = ru.artpancreas.$(DEVELOPMENT_TEAM).FreeAPS
APP_GROUP_ID = group.com.$(DEVELOPMENT_TEAM).loopkit.LoopGroup
-APP_ICON = AppIcon
+APP_ICON = iAPS_Loop_Text
#include? "ConfigOverride.xcconfig"
#include? "../../ConfigOverride.xcconfig"
diff --git a/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents b/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
index 40d4450b32..c588967f10 100644
--- a/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
+++ b/Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents
@@ -21,7 +21,6 @@
-
@@ -47,6 +46,13 @@
+
+
+
+
+
+
+
@@ -68,5 +74,6 @@
+
\ No newline at end of file
diff --git a/Dependencies/CGMBLEKit/ResetTransmitter/Assets.xcassets/AppIcon.appiconset/Contents.json b/Dependencies/CGMBLEKit/ResetTransmitter/Assets.xcassets/AppIcon.appiconset/Contents.json
index 2a71258dd3..9212273d81 100644
--- a/Dependencies/CGMBLEKit/ResetTransmitter/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Dependencies/CGMBLEKit/ResetTransmitter/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -138,6 +138,13 @@
"scale" : "3x",
"size" : "29x29"
},
+ {
+ "idiom" : "watch",
+ "role" : "notificationCenter",
+ "scale" : "2x",
+ "size" : "33x33",
+ "subtype" : "45mm"
+ },
{
"filename" : "Icon-40@2x.png",
"idiom" : "watch",
@@ -154,6 +161,13 @@
"size" : "44x44",
"subtype" : "40mm"
},
+ {
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "46x46",
+ "subtype" : "41mm"
+ },
{
"idiom" : "watch",
"role" : "appLauncher",
@@ -161,6 +175,20 @@
"size" : "50x50",
"subtype" : "44mm"
},
+ {
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "51x51",
+ "subtype" : "45mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "appLauncher",
+ "scale" : "2x",
+ "size" : "54x54",
+ "subtype" : "49mm"
+ },
{
"filename" : "Icon-86@2x.png",
"idiom" : "watch",
@@ -184,6 +212,20 @@
"size" : "108x108",
"subtype" : "44mm"
},
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "117x117",
+ "subtype" : "45mm"
+ },
+ {
+ "idiom" : "watch",
+ "role" : "quickLook",
+ "scale" : "2x",
+ "size" : "129x129",
+ "subtype" : "49mm"
+ },
{
"idiom" : "watch-marketing",
"scale" : "1x",
@@ -193,8 +235,5 @@
"info" : {
"author" : "xcode",
"version" : 1
- },
- "properties" : {
- "pre-rendered" : true
}
}
diff --git a/FreeAPS.xcodeproj/project.pbxproj b/FreeAPS.xcodeproj/project.pbxproj
index 64bc65cd67..93cecb1d6d 100644
--- a/FreeAPS.xcodeproj/project.pbxproj
+++ b/FreeAPS.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
17A9D0899046B45E87834820 /* CREditorProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9C8D5F457B5AFF763F8CF3DF /* CREditorProvider.swift */; };
19012CDC291D2CB900FB8210 /* LoopStats.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19012CDB291D2CB900FB8210 /* LoopStats.swift */; };
1927C8E62744606D00347C69 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 1927C8E82744606D00347C69 /* InfoPlist.strings */; };
- 1935364028496F7D001E0B16 /* TDD_averages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1935363F28496F7D001E0B16 /* TDD_averages.swift */; };
+ 1935364028496F7D001E0B16 /* Oref2_variables.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1935363F28496F7D001E0B16 /* Oref2_variables.swift */; };
19795118275953E50044850D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 198377D4266BFFF6004DE65E /* Localizable.strings */; };
198377D2266BFFF6004DE65E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 198377D4266BFFF6004DE65E /* Localizable.strings */; };
19854F492961C3E500941627 /* DurationButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19854F482961C3E500941627 /* DurationButton.swift */; };
@@ -25,6 +25,13 @@
19D466A529AA2BD4004D5F33 /* FPUConfigProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D466A429AA2BD4004D5F33 /* FPUConfigProvider.swift */; };
19D466A729AA2C22004D5F33 /* FPUConfigStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D466A629AA2C22004D5F33 /* FPUConfigStateModel.swift */; };
19D466AA29AA3099004D5F33 /* FPUConfigRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D466A929AA3099004D5F33 /* FPUConfigRootView.swift */; };
+ 19DA48E829CD339B00EEA1E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 19DA487F29CD2B8400EEA1E7 /* Assets.xcassets */; };
+ 19DA48E929CD339C00EEA1E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 19DA487F29CD2B8400EEA1E7 /* Assets.xcassets */; };
+ 19DA48EA29CD339C00EEA1E7 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 19DA487F29CD2B8400EEA1E7 /* Assets.xcassets */; };
+ 19DC677F29CA675700FD9EC4 /* OverrideProfilesDataFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DC677E29CA675700FD9EC4 /* OverrideProfilesDataFlow.swift */; };
+ 19DC678129CA676A00FD9EC4 /* OverrideProfilesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DC678029CA676A00FD9EC4 /* OverrideProfilesProvider.swift */; };
+ 19DC678329CA677D00FD9EC4 /* OverrideProfilesStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DC678229CA677D00FD9EC4 /* OverrideProfilesStateModel.swift */; };
+ 19DC678529CA67A400FD9EC4 /* OverrideProfilesRootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19DC678429CA67A400FD9EC4 /* OverrideProfilesRootView.swift */; };
1BBB001DAD60F3B8CEA4B1C7 /* ISFEditorStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 505E09DC17A0C3D0AF4B66FE /* ISFEditorStateModel.swift */; };
1D845DF2E3324130E1D95E67 /* DataTableProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 60744C3E9BB3652895C908CC /* DataTableProvider.swift */; };
23888883D4EA091C88480FF2 /* BolusProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = C19984D62EFC0035A9E9644D /* BolusProvider.swift */; };
@@ -130,7 +137,6 @@
388358C825EEF6D200E024B2 /* BasalProfileEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 388358C725EEF6D200E024B2 /* BasalProfileEntry.swift */; };
38887CCE25F5725200944304 /* IOBEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38887CCD25F5725200944304 /* IOBEntry.swift */; };
388E595C25AD948C0019842D /* FreeAPSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 388E595B25AD948C0019842D /* FreeAPSApp.swift */; };
- 388E596025AD948E0019842D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 388E595F25AD948E0019842D /* Assets.xcassets */; };
388E596C25AD95110019842D /* OpenAPS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 388E596B25AD95110019842D /* OpenAPS.swift */; };
388E596F25AD96040019842D /* javascript in Resources */ = {isa = PBXBuildFile; fileRef = 388E596E25AD96040019842D /* javascript */; };
388E597225AD9CF10019842D /* json in Resources */ = {isa = PBXBuildFile; fileRef = 388E597125AD9CF10019842D /* json */; };
@@ -203,8 +209,6 @@
38E8753427554D5800975559 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 38E8753327554D5800975559 /* Assets.xcassets */; };
38E8753727554D5900975559 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 38E8753627554D5800975559 /* Preview Assets.xcassets */; };
38E8753C27554D5900975559 /* FreeAPSWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 38E8751C27554D5500975559 /* FreeAPSWatch.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
- 38E8754527554D8800975559 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 388E595F25AD948E0019842D /* Assets.xcassets */; };
- 38E8754627554D8A00975559 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 388E595F25AD948E0019842D /* Assets.xcassets */; };
38E8754727554DF100975559 /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38F37827261260DC009DB701 /* Color+Extensions.swift */; };
38E8754A275550BB00975559 /* CarbsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38E87549275550BB00975559 /* CarbsView.swift */; };
38E8754C2755548F00975559 /* WatchStateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 38E8754B2755548F00975559 /* WatchStateModel.swift */; };
@@ -467,7 +471,8 @@
1927C8FA2744612500347C69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = ""; };
1927C8FB2744612600347C69 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = ""; };
1927C8FE274489BA00347C69 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = ""; };
- 1935363F28496F7D001E0B16 /* TDD_averages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TDD_averages.swift; sourceTree = ""; };
+ 1935363F28496F7D001E0B16 /* Oref2_variables.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Oref2_variables.swift; sourceTree = ""; };
+ 1980131D29CC9839002FF024 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = ""; };
198377D3266BFFF6004DE65E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; };
198377D5266C0A05004DE65E /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = ""; };
198377D6266C0A0A004DE65E /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; };
@@ -496,6 +501,11 @@
19D466A429AA2BD4004D5F33 /* FPUConfigProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FPUConfigProvider.swift; sourceTree = ""; };
19D466A629AA2C22004D5F33 /* FPUConfigStateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FPUConfigStateModel.swift; sourceTree = ""; };
19D466A929AA3099004D5F33 /* FPUConfigRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FPUConfigRootView.swift; sourceTree = ""; };
+ 19DA487F29CD2B8400EEA1E7 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; };
+ 19DC677E29CA675700FD9EC4 /* OverrideProfilesDataFlow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideProfilesDataFlow.swift; sourceTree = ""; };
+ 19DC678029CA676A00FD9EC4 /* OverrideProfilesProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideProfilesProvider.swift; sourceTree = ""; };
+ 19DC678229CA677D00FD9EC4 /* OverrideProfilesStateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideProfilesStateModel.swift; sourceTree = ""; };
+ 19DC678429CA67A400FD9EC4 /* OverrideProfilesRootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OverrideProfilesRootView.swift; sourceTree = ""; };
1CAE81192B118804DCD23034 /* SnoozeProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SnoozeProvider.swift; sourceTree = ""; };
212E8BFE6D66EE65AA26A114 /* CalibrationsProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CalibrationsProvider.swift; sourceTree = ""; };
223EC0494F55A91E3EA69EF4 /* BolusStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusStateModel.swift; sourceTree = ""; };
@@ -589,7 +599,6 @@
38887CCD25F5725200944304 /* IOBEntry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IOBEntry.swift; sourceTree = ""; };
388E595825AD948C0019842D /* FreeAPS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FreeAPS.app; sourceTree = BUILT_PRODUCTS_DIR; };
388E595B25AD948C0019842D /* FreeAPSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FreeAPSApp.swift; sourceTree = ""; };
- 388E595F25AD948E0019842D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; };
388E596425AD948E0019842D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
388E596B25AD95110019842D /* OpenAPS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenAPS.swift; sourceTree = ""; };
388E596E25AD96040019842D /* javascript */ = {isa = PBXFileReference; lastKnownFileType = folder; path = javascript; sourceTree = ""; };
@@ -956,6 +965,25 @@
path = View;
sourceTree = "";
};
+ 19DC677C29CA66F200FD9EC4 /* OverrideProfilesConfig */ = {
+ isa = PBXGroup;
+ children = (
+ 19DC677E29CA675700FD9EC4 /* OverrideProfilesDataFlow.swift */,
+ 19DC678029CA676A00FD9EC4 /* OverrideProfilesProvider.swift */,
+ 19DC678229CA677D00FD9EC4 /* OverrideProfilesStateModel.swift */,
+ 19DC677D29CA672500FD9EC4 /* View */,
+ );
+ path = OverrideProfilesConfig;
+ sourceTree = "";
+ };
+ 19DC677D29CA672500FD9EC4 /* View */ = {
+ isa = PBXGroup;
+ children = (
+ 19DC678429CA67A400FD9EC4 /* OverrideProfilesRootView.swift */,
+ );
+ path = View;
+ sourceTree = "";
+ };
29B478DF61BF8D270F7D8954 /* Snooze */ = {
isa = PBXGroup;
children = (
@@ -998,6 +1026,7 @@
5031FE61F63C2A8A8B7674DD /* ManualTempBasal */,
D533BF261CDC1C3F871E7BFD /* NightscoutConfig */,
F66B236E00924A05D6A9F9DF /* NotificationsConfig */,
+ 19DC677C29CA66F200FD9EC4 /* OverrideProfilesConfig */,
3E1C41D9301B7058AA7BF5EA /* PreferencesEditor */,
99C01B871ACAB3F32CE755C7 /* PumpConfig */,
E493126EA71765130F64CCE5 /* PumpSettingsEditor */,
@@ -1193,7 +1222,7 @@
3811DEC725C9DA7300A708ED /* FreeAPS.entitlements */,
388E596425AD948E0019842D /* Info.plist */,
1927C8E82744606D00347C69 /* InfoPlist.strings */,
- 388E595F25AD948E0019842D /* Assets.xcassets */,
+ 19DA487F29CD2B8400EEA1E7 /* Assets.xcassets */,
);
path = Resources;
sourceTree = "";
@@ -1416,7 +1445,7 @@
3871F39B25ED892B0013ECB5 /* TempTarget.swift */,
3811DE8E25C9D80400A708ED /* User.swift */,
E0D4F80427513ECF00BDF1FE /* HealthKitSample.swift */,
- 1935363F28496F7D001E0B16 /* TDD_averages.swift */,
+ 1935363F28496F7D001E0B16 /* Oref2_variables.swift */,
CE82E02628E869DF00473A9C /* AlertEntry.swift */,
19B0EF2028F6D66200069496 /* Statistics.swift */,
19012CDB291D2CB900FB8210 /* LoopStats.swift */,
@@ -1549,6 +1578,7 @@
38E8751D27554D5500975559 /* FreeAPSWatch */ = {
isa = PBXGroup;
children = (
+ 1980131D29CC9839002FF024 /* Info.plist */,
38E8755627564B6100975559 /* FreeAPSWatch.entitlements */,
38E8751E27554D5700975559 /* Assets.xcassets */,
);
@@ -2175,11 +2205,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 388E596025AD948E0019842D /* Assets.xcassets in Resources */,
198377D2266BFFF6004DE65E /* Localizable.strings in Resources */,
38DF178D27733E6800B3528F /* snow.sks in Resources */,
388E597225AD9CF10019842D /* json in Resources */,
38DF178E27733E6800B3528F /* Assets.xcassets in Resources */,
+ 19DA48E829CD339B00EEA1E7 /* Assets.xcassets in Resources */,
388E596F25AD96040019842D /* javascript in Resources */,
1927C8E62744606D00347C69 /* InfoPlist.strings in Resources */,
);
@@ -2189,7 +2219,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 38E8754527554D8800975559 /* Assets.xcassets in Resources */,
+ 19DA48E929CD339C00EEA1E7 /* Assets.xcassets in Resources */,
38E8751F27554D5700975559 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -2200,7 +2230,7 @@
files = (
38E8753727554D5900975559 /* Preview Assets.xcassets in Resources */,
19795118275953E50044850D /* Localizable.strings in Resources */,
- 38E8754627554D8A00975559 /* Assets.xcassets in Resources */,
+ 19DA48EA29CD339C00EEA1E7 /* Assets.xcassets in Resources */,
38E8753427554D5800975559 /* Assets.xcassets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -2321,6 +2351,7 @@
E013D872273AC6FE0014109C /* GlucoseSimulatorSource.swift in Sources */,
388E5A5C25B6F0770019842D /* JSON.swift in Sources */,
3811DF0225CA9FEA00A708ED /* Credentials.swift in Sources */,
+ 19DC678529CA67A400FD9EC4 /* OverrideProfilesRootView.swift in Sources */,
389A572026079BAA00BC102F /* Interpolation.swift in Sources */,
38B4F3C625E5017E00E76A18 /* NotificationCenter.swift in Sources */,
19D466A729AA2C22004D5F33 /* FPUConfigStateModel.swift in Sources */,
@@ -2395,7 +2426,8 @@
38C4D33A25E9A1ED00D30B77 /* NSObject+AssociatedValues.swift in Sources */,
38DF179027733EAD00B3528F /* SnowScene.swift in Sources */,
38AAF8712600C1B0004AF583 /* MainChartView.swift in Sources */,
- 1935364028496F7D001E0B16 /* TDD_averages.swift in Sources */,
+ 19DC677F29CA675700FD9EC4 /* OverrideProfilesDataFlow.swift in Sources */,
+ 1935364028496F7D001E0B16 /* Oref2_variables.swift in Sources */,
CE2FAD3A297D93F0001A872C /* BloodGlucoseExtensions.swift in Sources */,
38E4453A274E411700EC9A94 /* Disk+[UIImage].swift in Sources */,
72F1BD388F42FCA6C52E4500 /* ConfigEditorProvider.swift in Sources */,
@@ -2419,6 +2451,7 @@
A0B8EC8CC5CD1DD237D1BCD2 /* PumpSettingsEditorRootView.swift in Sources */,
E06B911A275B5EEA003C04B6 /* Array+Extension.swift in Sources */,
38EA0600262091870064E39B /* BolusProgressViewStyle.swift in Sources */,
+ 19DC678329CA677D00FD9EC4 /* OverrideProfilesStateModel.swift in Sources */,
389ECDFE2601061500D86C4F /* View+Snapshot.swift in Sources */,
38FEF3FE2738083E00574A46 /* CGMProvider.swift in Sources */,
38E98A3725F5509500C0CED0 /* String+Extensions.swift in Sources */,
@@ -2457,6 +2490,7 @@
F5F7E6C1B7F098F59EB67EC5 /* TargetsEditorDataFlow.swift in Sources */,
5075C1608E6249A51495C422 /* TargetsEditorProvider.swift in Sources */,
E13B7DAB2A435F57066AF02E /* TargetsEditorStateModel.swift in Sources */,
+ 19DC678129CA676A00FD9EC4 /* OverrideProfilesProvider.swift in Sources */,
9702FF92A09C53942F20D7EA /* TargetsEditorRootView.swift in Sources */,
38E8754F275556FA00975559 /* WatchManager.swift in Sources */,
A228DF96647338139F152B15 /* PreferencesEditorDataFlow.swift in Sources */,
@@ -2804,7 +2838,7 @@
buildSettings = {
APP_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
APP_GROUP_ID = "$(APP_GROUP_ID)";
- ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON)";
+ ASSETCATALOG_COMPILER_APPICON_NAME = iAPS_Loop_Text;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
CODE_SIGN_ENTITLEMENTS = FreeAPS/Resources/FreeAPS.entitlements;
@@ -2850,6 +2884,7 @@
DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
GENERATE_INFOPLIST_FILE = YES;
IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
+ INFOPLIST_FILE = FreeAPSWatch/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = iAPS;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(BUNDLE_IDENTIFIER)";
@@ -2870,7 +2905,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
APP_DISPLAY_NAME = "$(APP_DISPLAY_NAME)";
- ASSETCATALOG_COMPILER_APPICON_NAME = "$(APP_ICON)";
+ ASSETCATALOG_COMPILER_APPICON_NAME = iAPS_Loop_Text;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
@@ -2880,6 +2915,7 @@
DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
GENERATE_INFOPLIST_FILE = YES;
IBSC_MODULE = FreeAPSWatch_WatchKit_Extension;
+ INFOPLIST_FILE = FreeAPSWatch/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = iAPS;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(BUNDLE_IDENTIFIER)";
diff --git a/FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved b/FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 5edb0a81dd..2cfe78ebfa 100644
--- a/FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/FreeAPS.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift",
"state": {
"branch": null,
- "revision": "039f56c5d7960f277087a0be51f5eb04ed0ec073",
- "version": "1.5.1"
+ "revision": "19b3c3ceed117c5cc883517c4e658548315ba70b",
+ "version": "1.6.0"
}
},
{
@@ -30,7 +30,7 @@
},
{
"package": "SwiftCharts",
- "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts",
+ "repositoryURL": "https://github.com/ivanschuetz/SwiftCharts.git",
"state": {
"branch": "master",
"revision": "c354c1945bb35a1f01b665b22474f6db28cba4a2",
@@ -51,8 +51,8 @@
"repositoryURL": "https://github.com/SwiftKickMobile/SwiftMessages",
"state": {
"branch": null,
- "revision": "1e49de7b3780b69927bc3e61903d8ec0693a3dc5",
- "version": "9.0.5"
+ "revision": "b29dd21090b708aa0ae9ecbaf6e2d0487028dc3f",
+ "version": "9.0.6"
}
},
{
@@ -60,8 +60,8 @@
"repositoryURL": "https://github.com/Swinject/Swinject",
"state": {
"branch": null,
- "revision": "f10b6e9ebff440f985c43008f7c2d097639fcb81",
- "version": "2.8.1"
+ "revision": "8bc503e60965298984fb58cf47b71c541449fe2a",
+ "version": "2.8.3"
}
}
]
diff --git a/FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024 1.png b/FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024 1.png
deleted file mode 100644
index 768ae9a7b7d343a759416f1d201a6780ebb45d71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 109003
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