Просмотр исходного кода

Revert "Merge remote-tracking branch 'refs/remotes/origin/Crowdin'"

This reverts commit a4944aa2439efd1b3d9aa98f9150336674d1816e.
Jon Mårtensson 4 лет назад
Родитель
Сommit
38f610096b
100 измененных файлов с 183 добавлено и 1686 удалено
  1. 0 1
      Dependecies/LoopKit/LoopKit Example/sv.lproj/LaunchScreen.strings
  2. 0 9
      Dependecies/LoopKit/LoopKit Example/sv.lproj/Main.strings
  3. 0 30
      Dependecies/LoopKit/LoopKitUI/sv.lproj/LegacyInsulinDeliveryTableViewController.strings
  4. 0 13
      Dependencies/LoopKit/LoopKit.xcodeproj/project.pbxproj
  5. 33 34
      Dependencies/LoopKit/LoopKitUI/sv.lproj/CarbKit.strings
  6. 14 18
      Dependencies/LoopKit/LoopKitUI/sv.lproj/InsulinKit.strings
  7. 0 33
      Dependencies/LoopKit/LoopKitUI/sv.lproj/LegacyInsulinDeliveryTableViewController.strings
  8. 0 3
      Dependencies/rileylink_ios/RileyLink.xcodeproj/project.pbxproj
  9. 38 52
      FreeAPS.xcodeproj/project.pbxproj
  10. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/100.png
  11. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024.png
  12. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-1024.png
  13. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-1024@1x.png
  14. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-108@2x.png
  15. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-128.png
  16. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-16.png
  17. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20.png
  18. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20@2x.png
  19. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20@3x.png
  20. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-24@2x.png
  21. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-24@3x.png
  22. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-256.png
  23. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-27-5@2x.png
  24. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29.png
  25. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29@2x.png
  26. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29@3x.png
  27. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-32.png
  28. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40.png
  29. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40@2x.png
  30. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40@3x.png
  31. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-44@2x.png
  32. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-50@2x.png
  33. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-512.png
  34. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-60@2x.png
  35. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-60@3x.png
  36. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-64.png
  37. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-76.png
  38. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-76@2x.png
  39. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-83.5@2x.png
  40. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-86@2x.png
  41. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-98@2x.png
  42. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/114.png
  43. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/120.png
  44. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/128.png
  45. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/144.png
  46. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/152.png
  47. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/16.png
  48. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/167.png
  49. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/172.png
  50. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/180.png
  51. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/196.png
  52. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/20.png
  53. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/216.png
  54. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/256.png
  55. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/29.png
  56. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/32.png
  57. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/40.png
  58. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/48.png
  59. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/50.png
  60. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/512.png
  61. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/55.png
  62. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/57.png
  63. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/58.png
  64. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/60.png
  65. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/64.png
  66. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/72.png
  67. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/76.png
  68. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/80.png
  69. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/87.png
  70. 0 0
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/88.png
  71. 80 56
      FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
  72. BIN
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/1024.pxm
  73. 0 330
      FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/Contents.json
  74. 0 28
      FreeAPS/Resources/Assets.xcassets/Colors/Background.colorset/Contents.json
  75. 0 28
      FreeAPS/Resources/Assets.xcassets/Colors/LoopOrange.colorset/Contents.json
  76. 1 1
      FreeAPS/Resources/FreeAPS.entitlements
  77. 2 6
      FreeAPS/Resources/Info.plist
  78. 1 1
      FreeAPS/Resources/javascript/bundle/autosens.js
  79. 1 1
      FreeAPS/Resources/javascript/bundle/autotune-core.js
  80. 1 1
      FreeAPS/Resources/javascript/bundle/autotune-prep.js
  81. 1 1
      FreeAPS/Resources/javascript/bundle/basal-set-temp.js
  82. 1 1
      FreeAPS/Resources/javascript/bundle/determine-basal.js
  83. 1 1
      FreeAPS/Resources/javascript/bundle/glucose-get-last.js
  84. 1 1
      FreeAPS/Resources/javascript/bundle/iob.js
  85. 1 1
      FreeAPS/Resources/javascript/bundle/meal.js
  86. 1 1
      FreeAPS/Resources/javascript/bundle/profile.js
  87. 1 20
      FreeAPS/Sources/APS/DeviceDataManager.swift
  88. 4 6
      FreeAPS/Sources/APS/Storage/GlucoseStorage.swift
  89. 0 17
      FreeAPS/Sources/Application/FreeAPSApp.swift
  90. 1 1
      FreeAPS/Sources/Config/Config.swift
  91. 0 2
      FreeAPS/Sources/Helpers/Color+Extensions.swift
  92. 0 118
      FreeAPS/Sources/Localizations/Descriptions/ar.lproj/Descriptions.strings
  93. 0 133
      FreeAPS/Sources/Localizations/Descriptions/ca.lproj/Descriptions.strings
  94. 0 118
      FreeAPS/Sources/Localizations/Descriptions/da.lproj/Descriptions.strings
  95. 0 118
      FreeAPS/Sources/Localizations/Descriptions/de.lproj/Descriptions.strings
  96. 0 133
      FreeAPS/Sources/Localizations/Descriptions/el.lproj/Descriptions.strings
  97. 0 133
      FreeAPS/Sources/Localizations/Descriptions/en.lproj/Descriptions.strings
  98. 0 118
      FreeAPS/Sources/Localizations/Descriptions/es.lproj/Descriptions.strings
  99. 0 118
      FreeAPS/Sources/Localizations/Descriptions/fi.lproj/Descriptions.strings
  100. 0 0
      FreeAPS/Sources/Localizations/Descriptions/fr.lproj/Descriptions.strings

+ 0 - 1
Dependecies/LoopKit/LoopKit Example/sv.lproj/LaunchScreen.strings

@@ -1 +0,0 @@
-

+ 0 - 9
Dependecies/LoopKit/LoopKit Example/sv.lproj/Main.strings

@@ -1,9 +0,0 @@
-
-/* Class = "UITableViewController"; title = "UI Tests"; ObjectID = "7bK-jq-Zjz"; */
-"7bK-jq-Zjz.title" = "UI Tests";
-
-/* Class = "UILabel"; text = "Title"; ObjectID = "Arm-wq-HPj"; */
-"Arm-wq-HPj.text" = "Title";
-
-/* Class = "UINavigationController"; title = "UI Tests"; ObjectID = "RMx-3f-FxP"; */
-"RMx-3f-FxP.title" = "UI Tests";

+ 0 - 30
Dependecies/LoopKit/LoopKitUI/sv.lproj/LegacyInsulinDeliveryTableViewController.strings

@@ -1,30 +0,0 @@
-
-/* Class = "UILabel"; text = "Title"; ObjectID = "7Fi-wD-gf2"; */
-"7Fi-wD-gf2.text" = "Title";
-
-/* Class = "UILabel"; text = "..."; ObjectID = "7Fy-gG-Zof"; */
-"7Fy-gG-Zof.text" = "...";
-
-/* Class = "UILabel"; text = "Detail"; ObjectID = "9jm-X6-3QA"; */
-"9jm-X6-3QA.text" = "Detail";
-
-/* Class = "UILabel"; text = "..."; ObjectID = "PZQ-gO-084"; */
-"PZQ-gO-084.text" = "...";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[0] = "Reservoir"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[0]" = "Reservoir";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[1] = "Event History"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[1]" = "Event History";
-
-/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */
-"dZi-Ta-IHm.text" = "U IOB";
-
-/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */
-"jSc-64-2tZ.text" = "No pump configured";
-
-/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */
-"kys-by-14s.text" = "U Total";
-
-/* Class = "UINavigationItem"; title = "Insulin Delivery"; ObjectID = "vls-EW-uwI"; */
-"vls-EW-uwI.title" = "Insulin Delivery";

+ 0 - 13
Dependencies/LoopKit/LoopKit.xcodeproj/project.pbxproj

@@ -916,12 +916,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		1971A853268B0EED0083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
-		1971A854268B0EED0083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Main.strings; sourceTree = "<group>"; };
-		1971A855268B0EED0083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/CarbKit.strings; sourceTree = "<group>"; };
-		1971A856268B0EEE0083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InsulinKit.strings; sourceTree = "<group>"; };
-		1971A857268B0EEE0083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/LegacyInsulinDeliveryTableViewController.strings; sourceTree = "<group>"; };
-		1971A858268B0F520083CF2D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
 		1D096BF924C242300078B6B5 /* CheckmarkListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckmarkListItem.swift; sourceTree = "<group>"; };
 		1D096BFF24C24C220078B6B5 /* InsulinModelSettings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InsulinModelSettings.swift; sourceTree = "<group>"; };
 		1D096C0024C24C220078B6B5 /* ExponentialInsulinModelPreset.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExponentialInsulinModelPreset.swift; sourceTree = "<group>"; };
@@ -2956,7 +2950,6 @@
 				nb,
 				pl,
 				ru,
-				sv,
 			);
 			mainGroup = 43D8FDC11C728FDF0073BE78;
 			productRefGroup = 43D8FDCC1C728FDF0073BE78 /* Products */;
@@ -4023,7 +4016,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				430158001C7EC03B00B64B63 /* Base */,
-				1971A854268B0EED0083CF2D /* sv */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -4032,7 +4024,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				430158051C7EC03B00B64B63 /* Base */,
-				1971A853268B0EED0083CF2D /* sv */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -4050,7 +4041,6 @@
 				1F5DAB6B2118F3C200048054 /* nl */,
 				1F5DAB772118F3FB00048054 /* nb */,
 				1F50C321212B20D300C18FAB /* pl */,
-				1971A855268B0EED0083CF2D /* sv */,
 			);
 			name = CarbKit.storyboard;
 			sourceTree = "<group>";
@@ -4068,7 +4058,6 @@
 				1F5DAB6C2118F3C200048054 /* nl */,
 				1F5DAB782118F3FB00048054 /* nb */,
 				1F50C322212B20D300C18FAB /* pl */,
-				1971A856268B0EEE0083CF2D /* sv */,
 			);
 			name = InsulinKit.storyboard;
 			sourceTree = "<group>";
@@ -4103,7 +4092,6 @@
 				1F5DAB7F2118F3FC00048054 /* nb */,
 				1FE58790211CFBB7004F24ED /* Base */,
 				1F50C329212B20D400C18FAB /* pl */,
-				1971A858268B0F520083CF2D /* sv */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -4122,7 +4110,6 @@
 				E9DFB94524E8CD8300468917 /* pl */,
 				E9DFB94724E8CD8400468917 /* ru */,
 				E9DFB94924E8CD8600468917 /* es */,
-				1971A857268B0EEE0083CF2D /* sv */,
 			);
 			name = LegacyInsulinDeliveryTableViewController.storyboard;
 			sourceTree = "<group>";

+ 33 - 34
Dependencies/LoopKit/LoopKitUI/sv.lproj/CarbKit.strings

@@ -1,15 +1,29 @@
-
 /* Class = "UILabel"; text = "Authorize access to Health to continue"; ObjectID = "7xi-Om-Y53"; */
-"7xi-Om-Y53.text" = "Authorize access to Health to continue";
+"7xi-Om-Y53.text" = "Godkänn åtkomst till Apple Health för att fortsätta";
 
 /* Class = "UIButton"; normalTitle = "Authorize"; ObjectID = "8sx-XB-DRV"; */
-"8sx-XB-DRV.normalTitle" = "Authorize";
+"8sx-XB-DRV.normalTitle" = "Auktorisera";
+
+/* Class = "UILabel"; text = "Food Type"; ObjectID = "bdP-2A-DB8"; */
+"bdP-2A-DB8.text" = "Typ av mat";
+
+/* Class = "UINavigationItem"; title = "Add/Edit Carb Entry"; ObjectID = "bM2-yI-YmX"; */
+"bM2-yI-YmX.title" = "Kolhydrater";
 
 /* Class = "UILabel"; text = "g"; ObjectID = "D2S-2h-yH6"; */
 "D2S-2h-yH6.text" = "g";
 
+/* Class = "UIButton"; normalTitle = "🍕"; ObjectID = "dyX-Zv-8wU"; */
+"dyX-Zv-8wU.normalTitle" = "🍕";
+
 /* Class = "UILabel"; text = "Amount Consumed"; ObjectID = "K0S-my-3qL"; */
-"K0S-my-3qL.text" = "Amount Consumed";
+"K0S-my-3qL.text" = "Mängd";
+
+/* Class = "UILabel"; text = "..."; ObjectID = "lbE-wQ-pFK"; */
+"lbE-wQ-pFK.text" = "...";
+
+/* Class = "UILabel"; text = "Detail"; ObjectID = "m95-PG-bTq"; */
+"m95-PG-bTq.text" = "Detalj";
 
 /* Class = "UIButton"; normalTitle = "🍽"; ObjectID = "Mde-by-DTA"; */
 "Mde-by-DTA.normalTitle" = "🍽";
@@ -18,43 +32,28 @@
 "Me5-3D-C34.normalTitle" = "🌮";
 
 /* Class = "UILabel"; text = "Food Type"; ObjectID = "NRZ-dT-iqj"; */
-"NRZ-dT-iqj.text" = "Food Type";
+"NRZ-dT-iqj.text" = "Typ av mat";
+
+/* Class = "UILabel"; text = "HealthKit is not available on this device"; ObjectID = "nXh-BM-MuC"; */
+"nXh-BM-MuC.text" = "HealtKit är inte tillgänglig på denna enhet";
+
+/* Class = "UILabel"; text = "g Total"; ObjectID = "pHI-f4-pJp"; */
+"pHI-f4-pJp.text" = "g totalt";
+
+/* Class = "UINavigationItem"; title = "Carbohydrates"; ObjectID = "Qgq-n1-hm4"; */
+"Qgq-n1-hm4.title" = "Kolhydrater";
+
+/* Class = "UITextField"; placeholder = "0"; ObjectID = "qU9-hG-hMu"; */
+"qU9-hG-hMu.placeholder" = "0";
 
 /* Class = "UILabel"; text = "g COB"; ObjectID = "QZb-e1-xwb"; */
 "QZb-e1-xwb.text" = "g COB";
 
-/* Class = "UINavigationItem"; title = "Carbohydrates"; ObjectID = "Qgq-n1-hm4"; */
-"Qgq-n1-hm4.title" = "Carbohydrates";
+/* Class = "UILabel"; text = "Title"; ObjectID = "vM9-H7-t3C"; */
+"vM9-H7-t3C.text" = "Titel";
 
 /* Class = "UILabel"; text = "..."; ObjectID = "WZV-l9-Ek1"; */
 "WZV-l9-Ek1.text" = "...";
 
 /* Class = "UIButton"; normalTitle = "🍭"; ObjectID = "XaD-wV-oiS"; */
 "XaD-wV-oiS.normalTitle" = "🍭";
-
-/* Class = "UINavigationItem"; title = "Add/Edit Carb Entry"; ObjectID = "bM2-yI-YmX"; */
-"bM2-yI-YmX.title" = "Add/Edit Carb Entry";
-
-/* Class = "UILabel"; text = "Food Type"; ObjectID = "bdP-2A-DB8"; */
-"bdP-2A-DB8.text" = "Food Type";
-
-/* Class = "UIButton"; normalTitle = "🍕"; ObjectID = "dyX-Zv-8wU"; */
-"dyX-Zv-8wU.normalTitle" = "🍕";
-
-/* Class = "UILabel"; text = "..."; ObjectID = "lbE-wQ-pFK"; */
-"lbE-wQ-pFK.text" = "...";
-
-/* Class = "UILabel"; text = "Detail"; ObjectID = "m95-PG-bTq"; */
-"m95-PG-bTq.text" = "Detail";
-
-/* Class = "UILabel"; text = "HealthKit is not available on this device"; ObjectID = "nXh-BM-MuC"; */
-"nXh-BM-MuC.text" = "HealthKit is not available on this device";
-
-/* Class = "UILabel"; text = "g Total"; ObjectID = "pHI-f4-pJp"; */
-"pHI-f4-pJp.text" = "g Total";
-
-/* Class = "UITextField"; placeholder = "0"; ObjectID = "qU9-hG-hMu"; */
-"qU9-hG-hMu.placeholder" = "0";
-
-/* Class = "UILabel"; text = "Title"; ObjectID = "vM9-H7-t3C"; */
-"vM9-H7-t3C.text" = "Title";

+ 14 - 18
Dependencies/LoopKit/LoopKitUI/sv.lproj/InsulinKit.strings

@@ -1,33 +1,29 @@
-
 /* Class = "UILabel"; text = "Title"; ObjectID = "7Fi-wD-gf2"; */
-"7Fi-wD-gf2.text" = "Title";
+"7Fi-wD-gf2.text" = "Titel";
 
 /* Class = "UILabel"; text = "..."; ObjectID = "7Fy-gG-Zof"; */
 "7Fy-gG-Zof.text" = "...";
 
 /* Class = "UILabel"; text = "Detail"; ObjectID = "9jm-X6-3QA"; */
-"9jm-X6-3QA.text" = "Detail";
+"9jm-X6-3QA.text" = "Detalj";
+
+/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */
+"dZi-Ta-IHm.text" = "E IOB";
+
+/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */
+"jSc-64-2tZ.text" = "Ingen pump konfigurerad";
+
+/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */
+"kys-by-14s.text" = "E totalt";
 
 /* Class = "UILabel"; text = "..."; ObjectID = "PZQ-gO-084"; */
 "PZQ-gO-084.text" = "...";
 
 /* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[0] = "Reservoir"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[0]" = "Reservoir";
+"TyZ-xm-mVN.segmentTitles[0]" = "Reservoar";
 
 /* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[1] = "Event History"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[1]" = "Event History";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[2] = "Outside Insulin"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[2]" = "Outside Insulin";
-
-/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */
-"dZi-Ta-IHm.text" = "U IOB";
-
-/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */
-"jSc-64-2tZ.text" = "No pump configured";
-
-/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */
-"kys-by-14s.text" = "U Total";
+"TyZ-xm-mVN.segmentTitles[1]" = "Händelsehistorik";
 
 /* Class = "UINavigationItem"; title = "Insulin Delivery"; ObjectID = "vls-EW-uwI"; */
-"vls-EW-uwI.title" = "Insulin Delivery";
+"vls-EW-uwI.title" = "Insulin doserat";

+ 0 - 33
Dependencies/LoopKit/LoopKitUI/sv.lproj/LegacyInsulinDeliveryTableViewController.strings

@@ -1,33 +0,0 @@
-/
-/* Class = "UILabel"; text = "Title"; ObjectID = "7Fi-wD-gf2"; */
-"7Fi-wD-gf2.text" = "Title";
-
-/* Class = "UILabel"; text = "..."; ObjectID = "7Fy-gG-Zof"; */
-"7Fy-gG-Zof.text" = "...";
-
-/* Class = "UILabel"; text = "Detail"; ObjectID = "9jm-X6-3QA"; */
-"9jm-X6-3QA.text" = "Detail";
-
-/* Class = "UILabel"; text = "..."; ObjectID = "PZQ-gO-084"; */
-"PZQ-gO-084.text" = "...";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[0] = "Reservoir"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[0]" = "Reservoar";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[1] = "Event History"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[1]" = "Händelsehistorik";
-
-/* Class = "UISegmentedControl"; TyZ-xm-mVN.segmentTitles[2] = "Outside Insulin"; ObjectID = "TyZ-xm-mVN"; */
-"TyZ-xm-mVN.segmentTitles[2]" = "Insulin från annan källa";
-
-/* Class = "UILabel"; text = "U IOB"; ObjectID = "dZi-Ta-IHm"; */
-"dZi-Ta-IHm.text" = "IE IOB";
-
-/* Class = "UILabel"; text = "No pump configured"; ObjectID = "jSc-64-2tZ"; */
-"jSc-64-2tZ.text" = "Ingen pump är inställd";
-
-/* Class = "UILabel"; text = "U Total"; ObjectID = "kys-by-14s"; */
-"kys-by-14s.text" = "IE totalt";
-
-/* Class = "UINavigationItem"; title = "Insulin Delivery"; ObjectID = "vls-EW-uwI"; */
-"vls-EW-uwI.title" = "Insulin doserat";

+ 0 - 3
Dependencies/rileylink_ios/RileyLink.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		198AA26227295EDC00FB87CE /* CommandResponseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 198AA26127295EDC00FB87CE /* CommandResponseViewController.swift */; };
 		2B19B9881DF3EF68006AB65F /* NewTimePumpEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2B19B9871DF3EF68006AB65F /* NewTimePumpEvent.swift */; };
 		2F962EC11E6872170070EFBD /* TimestampedHistoryEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F962EC01E6872170070EFBD /* TimestampedHistoryEventTests.swift */; };
 		2F962EC81E7074E60070EFBD /* BolusNormalPumpEventTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F962EC71E7074E60070EFBD /* BolusNormalPumpEventTests.swift */; };
@@ -1889,7 +1888,6 @@
 				7D23679521252EBC0028B67D /* Localizable.strings */,
 				43709AEB20E0056F00F941B3 /* RileyLinkKitUI.xcassets */,
 				C170C98D1CECD6F300F3D8E5 /* CBPeripheralState.swift */,
-				198AA26127295EDC00FB87CE /* CommandResponseViewController.swift */,
 				439731261CF21C3C00F474E5 /* RileyLinkDeviceTableViewCell.swift */,
 				C170C9981CECD80000F3D8E5 /* RileyLinkDeviceTableViewController.swift */,
 				B62DBD562725B9EB0050C038 /* CommandResponseViewController.swift */,
@@ -3634,7 +3632,6 @@
 				43709AEE20E008F300F941B3 /* SetupImageTableViewCell.swift in Sources */,
 				43709AF120E0127000F941B3 /* NibLoadable.swift in Sources */,
 				43D5E7A31FAF7D05004ACDB7 /* CBPeripheralState.swift in Sources */,
-				198AA26227295EDC00FB87CE /* CommandResponseViewController.swift in Sources */,
 				43D5E7A21FAF7CF2004ACDB7 /* CaseCountable.swift in Sources */,
 				435D26B620DA0BCC00891C17 /* RileyLinkDevicesTableViewDataSource.swift in Sources */,
 				43709AE820DF22E700F941B3 /* UIColor.swift in Sources */,

+ 38 - 52
FreeAPS.xcodeproj/project.pbxproj

@@ -296,11 +296,25 @@
 		10A0C32B0DAB52726EF9B6D9 /* BolusRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusRootView.swift; sourceTree = "<group>"; };
 		12204445D7632AF09264A979 /* PreferencesEditorDataFlow.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PreferencesEditorDataFlow.swift; sourceTree = "<group>"; };
 		1918333A26ADA46800F45722 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
+		1927C8E92744611700347C69 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8EA2744611800347C69 /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8EB2744611900347C69 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		1927C8EC2744611A00347C69 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8ED2744611B00347C69 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8EE2744611C00347C69 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8EF2744611D00347C69 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8F02744611E00347C69 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8F12744611E00347C69 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8F22744611F00347C69 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8F32744612000347C69 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8F42744612100347C69 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8F52744612100347C69 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		1927C8F62744612200347C69 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		1927C8F72744612300347C69 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8F82744612400347C69 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8F92744612400347C69 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8FA2744612500347C69 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1927C8FB2744612600347C69 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		1927C8FE274489BA00347C69 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		198377D3266BFFF6004DE65E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		198377D5266C0A05004DE65E /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -321,20 +335,6 @@
 		198377E4266C13D2004DE65E /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
 		199732B4271B72DD00129A3F /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		199732B5271B9EE900129A3F /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
-		1997ECA22745A239009548A7 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA32745A244009548A7 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA42745A24E009548A7 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA52745A25A009548A7 /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA62745A262009548A7 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA72745A26B009548A7 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA82745A273009548A7 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECA92745A27B009548A7 /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECAA2745A287009548A7 /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		1997ECAB2745A290009548A7 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
-		1997ECAC2745A297009548A7 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECAD2745A2A0009548A7 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECAE2745A2A5009548A7 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1997ECAF2745A2AF009548A7 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		212E8BFE6D66EE65AA26A114 /* CalibrationsProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = CalibrationsProvider.swift; sourceTree = "<group>"; };
 		223EC0494F55A91E3EA69EF4 /* BolusStateModel.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BolusStateModel.swift; sourceTree = "<group>"; };
 		2AD22C985B79A2F0D2EA3D9D /* PumpConfigRootView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PumpConfigRootView.swift; sourceTree = "<group>"; };
@@ -1567,20 +1567,6 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
-				ar,
-				"zh-Hans",
-				da,
-				nl,
-				fi,
-				fr,
-				de,
-				nb,
-				ru,
-				es,
-				sv,
-				uk,
-				it,
-				pl,
 				Base,
 				ar,
 				ca,
@@ -1897,26 +1883,26 @@
 		1927C8E82744606D00347C69 /* InfoPlist.strings */ = {
 			isa = PBXVariantGroup;
 			children = (
+				1927C8E92744611700347C69 /* ar */,
 				1927C8EA2744611800347C69 /* ca */,
 				1927C8EB2744611900347C69 /* zh-Hans */,
+				1927C8EC2744611A00347C69 /* da */,
+				1927C8ED2744611B00347C69 /* fi */,
+				1927C8EE2744611C00347C69 /* nl */,
+				1927C8EF2744611D00347C69 /* fr */,
+				1927C8F02744611E00347C69 /* de */,
+				1927C8F12744611E00347C69 /* he */,
 				1927C8F22744611F00347C69 /* it */,
 				1927C8F32744612000347C69 /* nb */,
+				1927C8F42744612100347C69 /* pl */,
+				1927C8F52744612100347C69 /* pt-BR */,
+				1927C8F62744612200347C69 /* pt-PT */,
+				1927C8F72744612300347C69 /* ru */,
+				1927C8F82744612400347C69 /* es */,
 				1927C8F92744612400347C69 /* sv */,
+				1927C8FA2744612500347C69 /* tr */,
+				1927C8FB2744612600347C69 /* uk */,
 				1927C8FE274489BA00347C69 /* Base */,
-				1997ECA22745A239009548A7 /* ar */,
-				1997ECA32745A244009548A7 /* da */,
-				1997ECA42745A24E009548A7 /* fi */,
-				1997ECA52745A25A009548A7 /* he */,
-				1997ECA62745A262009548A7 /* nl */,
-				1997ECA72745A26B009548A7 /* de */,
-				1997ECA82745A273009548A7 /* fr */,
-				1997ECA92745A27B009548A7 /* pl */,
-				1997ECAA2745A287009548A7 /* pt-PT */,
-				1997ECAB2745A290009548A7 /* pt-BR */,
-				1997ECAC2745A297009548A7 /* ru */,
-				1997ECAD2745A2A0009548A7 /* uk */,
-				1997ECAE2745A2A5009548A7 /* tr */,
-				1997ECAF2745A2AF009548A7 /* es */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2081,9 +2067,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = FreeAPS/Resources/FreeAPS.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "0.2.3 Auto ISF";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = T7VZ6LU6H3;
+				DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -2091,8 +2077,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "0.2.3 Auto ISF";
-				PRODUCT_BUNDLE_IDENTIFIER = com.T7VZ6LU6H3.aps;
+				MARKETING_VERSION = "$(CURRENT_PROJECT_VERSION)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2107,9 +2093,9 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = FreeAPS/Resources/FreeAPS.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "0.2.3 Auto ISF";
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "";
-				DEVELOPMENT_TEAM = T7VZ6LU6H3;
+				DEVELOPMENT_TEAM = "${DEVELOPER_TEAM}";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = FreeAPS/Resources/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -2117,8 +2103,8 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "0.2.3 Auto ISF";
-				PRODUCT_BUNDLE_IDENTIFIER = com.T7VZ6LU6H3.aps;
+				MARKETING_VERSION = "$(CURRENT_PROJECT_VERSION)";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -2130,7 +2116,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = T7VZ6LU6H3;
+				DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
 				INFOPLIST_FILE = FreeAPSTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -2151,7 +2137,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = T7VZ6LU6H3;
+				DEVELOPMENT_TEAM = "$(DEVELOPER_TEAM)";
 				INFOPLIST_FILE = FreeAPSTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.4;
 				LD_RUNPATH_SEARCH_PATHS = (

FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/100.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/100.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/1024.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-1024.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-1024@1x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-108@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-128.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-16.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-20@3x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-24@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-24@3x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-256.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-27-5@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-29@3x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-32.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-40@3x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-44@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-50@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-512.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-60@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-60@3x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-64.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-76.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-76@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-83.5@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-86@2x.png


BIN
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/1024_-98@2x.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/114.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/114.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/120.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/120.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/128.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/128.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/144.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/144.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/152.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/152.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/16.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/16.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/167.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/167.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/172.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/172.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/180.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/180.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/196.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/196.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/20.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/20.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/216.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/216.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/256.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/256.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/29.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/29.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/32.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/32.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/40.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/40.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/48.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/48.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/50.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/50.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/512.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/512.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/55.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/55.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/57.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/57.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/58.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/58.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/60.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/60.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/64.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/64.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/72.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/72.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/76.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/76.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/80.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/80.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/87.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/87.png


FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/88.png → FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/88.png


+ 80 - 56
FreeAPS/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,115 +1,157 @@
 {
   "images" : [
     {
-      "filename" : "1024_-20@2x.png",
+      "filename" : "40.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "1024_-20@3x.png",
+      "filename" : "60.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "20x20"
     },
     {
-      "filename" : "1024_-29@2x.png",
+      "filename" : "29.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "58.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "1024_-29@3x.png",
+      "filename" : "87.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "29x29"
     },
     {
-      "filename" : "1024_-40@2x.png",
+      "filename" : "80.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "1024_-40@3x.png",
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
     },
     {
-      "filename" : "1024_-60@2x.png",
+      "filename" : "57.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "114.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "57x57"
+    },
+    {
+      "filename" : "120.png",
       "idiom" : "iphone",
       "scale" : "2x",
       "size" : "60x60"
     },
     {
-      "filename" : "1024_-60@3x.png",
+      "filename" : "180.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "60x60"
     },
     {
-      "filename" : "1024_-20.png",
+      "filename" : "20.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "20x20"
     },
     {
-      "filename" : "1024_-20@2x.png",
+      "filename" : "40.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
     },
     {
-      "filename" : "1024_-29.png",
+      "filename" : "29.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "29x29"
     },
     {
-      "filename" : "1024_-29@2x.png",
+      "filename" : "58.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "1024_-40.png",
+      "filename" : "40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "1024_-40@2x.png",
+      "filename" : "80.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"
     },
     {
-      "filename" : "1024_-76.png",
+      "filename" : "50.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "100.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "50x50"
+    },
+    {
+      "filename" : "72.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "144.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "72x72"
+    },
+    {
+      "filename" : "76.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "76x76"
     },
     {
-      "filename" : "1024_-76@2x.png",
+      "filename" : "152.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "76x76"
     },
     {
-      "filename" : "1024_-83.5@2x.png",
+      "filename" : "167.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "83.5x83.5"
     },
     {
-      "filename" : "1024_-1024.png",
+      "filename" : "1024.png",
       "idiom" : "ios-marketing",
       "scale" : "1x",
       "size" : "1024x1024"
     },
     {
-      "filename" : "1024_-24@2x.png",
+      "filename" : "48.png",
       "idiom" : "watch",
       "role" : "notificationCenter",
       "scale" : "2x",
@@ -117,7 +159,7 @@
       "subtype" : "38mm"
     },
     {
-      "filename" : "1024_-27-5@2x.png",
+      "filename" : "55.png",
       "idiom" : "watch",
       "role" : "notificationCenter",
       "scale" : "2x",
@@ -125,14 +167,14 @@
       "subtype" : "42mm"
     },
     {
-      "filename" : "1024_-29@2x.png",
+      "filename" : "58.png",
       "idiom" : "watch",
       "role" : "companionSettings",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "1024_-24@3x.png",
+      "filename" : "87.png",
       "idiom" : "watch",
       "role" : "companionSettings",
       "scale" : "3x",
@@ -146,6 +188,7 @@
       "subtype" : "45mm"
     },
     {
+      "filename" : "80.png",
       "idiom" : "watch",
       "role" : "appLauncher",
       "scale" : "2x",
@@ -153,7 +196,7 @@
       "subtype" : "38mm"
     },
     {
-      "filename" : "1024_-44@2x.png",
+      "filename" : "88.png",
       "idiom" : "watch",
       "role" : "appLauncher",
       "scale" : "2x",
@@ -168,6 +211,7 @@
       "subtype" : "41mm"
     },
     {
+      "filename" : "100.png",
       "idiom" : "watch",
       "role" : "appLauncher",
       "scale" : "2x",
@@ -182,6 +226,7 @@
       "subtype" : "45mm"
     },
     {
+      "filename" : "172.png",
       "idiom" : "watch",
       "role" : "quickLook",
       "scale" : "2x",
@@ -189,7 +234,7 @@
       "subtype" : "38mm"
     },
     {
-      "filename" : "1024_-98@2x.png",
+      "filename" : "196.png",
       "idiom" : "watch",
       "role" : "quickLook",
       "scale" : "2x",
@@ -197,7 +242,7 @@
       "subtype" : "42mm"
     },
     {
-      "filename" : "1024_-108@2x.png",
+      "filename" : "216.png",
       "idiom" : "watch",
       "role" : "quickLook",
       "scale" : "2x",
@@ -218,85 +263,64 @@
       "size" : "1024x1024"
     },
     {
-      "filename" : "1024_-16.png",
+      "filename" : "16.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "16x16"
     },
     {
-      "filename" : "1024_-32.png",
+      "filename" : "32.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "16x16"
     },
     {
-      "filename" : "1024_-32.png",
+      "filename" : "32.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "32x32"
     },
     {
-      "filename" : "1024_-64.png",
+      "filename" : "64.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "32x32"
     },
     {
-      "filename" : "1024_-128.png",
+      "filename" : "128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
-      "filename" : "1024_-256.png",
+      "filename" : "256.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
-      "filename" : "1024_-256.png",
+      "filename" : "256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
-      "filename" : "1024_-512.png",
+      "filename" : "512.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"
     },
     {
-      "filename" : "1024_-512.png",
+      "filename" : "512.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "512x512"
     },
     {
-      "filename" : "1024_-1024.png",
+      "filename" : "1024.png",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "512x512"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "100.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "subtype" : "44mm"
-    },
-    {
-      "filename" : "172.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "subtype" : "38mm"
     }
   ],
   "info" : {

BIN
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/1024.pxm


+ 0 - 330
FreeAPS/Resources/Assets.xcassets/AppIcon_Orig.appiconset/Contents.json

@@ -1,330 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "40.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "60.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "29.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "87.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "57.png",
-      "idiom" : "iphone",
-      "scale" : "1x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "114.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "57x57"
-    },
-    {
-      "filename" : "120.png",
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "180.png",
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "filename" : "20.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "filename" : "29.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "40.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "filename" : "50.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "50x50"
-    },
-    {
-      "filename" : "100.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "50x50"
-    },
-    {
-      "filename" : "72.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "144.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "72x72"
-    },
-    {
-      "filename" : "76.png",
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "152.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "filename" : "167.png",
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "filename" : "1024.png",
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "48.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "24x24",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "55.png",
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "27.5x27.5",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "58.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "filename" : "87.png",
-      "idiom" : "watch",
-      "role" : "companionSettings",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "notificationCenter",
-      "scale" : "2x",
-      "size" : "33x33",
-      "subtype" : "45mm"
-    },
-    {
-      "filename" : "80.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "40x40",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "88.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "44x44",
-      "subtype" : "40mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "46x46",
-      "subtype" : "41mm"
-    },
-    {
-      "filename" : "100.png",
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "50x50",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "appLauncher",
-      "scale" : "2x",
-      "size" : "51x51",
-      "subtype" : "45mm"
-    },
-    {
-      "filename" : "172.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "86x86",
-      "subtype" : "38mm"
-    },
-    {
-      "filename" : "196.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "98x98",
-      "subtype" : "42mm"
-    },
-    {
-      "filename" : "216.png",
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "108x108",
-      "subtype" : "44mm"
-    },
-    {
-      "idiom" : "watch",
-      "role" : "quickLook",
-      "scale" : "2x",
-      "size" : "117x117",
-      "subtype" : "45mm"
-    },
-    {
-      "filename" : "1024.png",
-      "idiom" : "watch-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    },
-    {
-      "filename" : "16.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "16x16"
-    },
-    {
-      "filename" : "32.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "64.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "32x32"
-    },
-    {
-      "filename" : "128.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "128x128"
-    },
-    {
-      "filename" : "256.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "256x256"
-    },
-    {
-      "filename" : "512.png",
-      "idiom" : "mac",
-      "scale" : "1x",
-      "size" : "512x512"
-    },
-    {
-      "filename" : "1024.png",
-      "idiom" : "mac",
-      "scale" : "2x",
-      "size" : "512x512"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 28
FreeAPS/Resources/Assets.xcassets/Colors/Background.colorset/Contents.json

@@ -1,28 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "platform" : "ios",
-        "reference" : "systemBackgroundColor"
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "platform" : "ios",
-        "reference" : "systemBackgroundColor"
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 28
FreeAPS/Resources/Assets.xcassets/Colors/LoopOrange.colorset/Contents.json

@@ -1,28 +0,0 @@
-{
-  "colors" : [
-    {
-      "color" : {
-        "platform" : "ios",
-        "reference" : "systemOrangeColor"
-      },
-      "idiom" : "universal"
-    },
-    {
-      "appearances" : [
-        {
-          "appearance" : "luminosity",
-          "value" : "dark"
-        }
-      ],
-      "color" : {
-        "platform" : "osx",
-        "reference" : "systemOrangeColor"
-      },
-      "idiom" : "universal"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 1 - 1
FreeAPS/Resources/FreeAPS.entitlements

@@ -9,7 +9,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.T7VZ6LU6H3.aps.JBMgroup</string>
+		<string>$(APP_GROUP_ID)</string>
 	</array>
 </dict>
 </plist>

+ 2 - 6
FreeAPS/Resources/Info.plist

@@ -3,13 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>AppGroupID</key>
-	<string>group.com.T7VZ6LU6H3.aps.JBMgroup</string>
-	<key>AppGroupIdentifier</key>
-	<string>group.com.T7VZ6LU6H3.aps.JBMgroup</string>
+	<string>$(APP_GROUP_ID)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>iAPS</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -34,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<string>$(BUILD_VERSION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/autosens.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/autotune-core.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/autotune-prep.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/basal-set-temp.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/determine-basal.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/glucose-get-last.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/iob.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/meal.js


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
FreeAPS/Resources/javascript/bundle/profile.js


+ 1 - 20
FreeAPS/Sources/APS/DeviceDataManager.swift

@@ -102,26 +102,7 @@ final class BaseDeviceDataManager: DeviceDataManager, Injectable {
                 return
             }
 
-            let content = UNMutableNotificationContent()
-            content.badge = 0
-            let lastGlucose: BloodGlucose? = self.glucoseStorage.recent().last
-            if lastGlucose != nil {
-                if date.timeIntervalSince(lastGlucose!.dateString) < 5.1 * 60 {
-                    content.badge = NSNumber(value: lastGlucose!.glucose! * 10 / 18) // mmol/l value * 10
-                }
-            }
-
-            let request = UNNotificationRequest(
-                identifier: "badgeGlucose",
-                content: content,
-                trigger: nil
-            )
-
-            DispatchQueue.main.async {
-                UNUserNotificationCenter.current().add(request)
-            }
-
-            var updateInterval: TimeInterval = 1 * 60
+            var updateInterval: TimeInterval = 4.5 * 60
 
             switch date.timeIntervalSince(lastHeartBeatTime) {
             case let interval where interval > 10.minutes.timeInterval:

+ 4 - 6
FreeAPS/Sources/APS/Storage/GlucoseStorage.swift

@@ -19,7 +19,7 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
     @Injected() private var broadcaster: Broadcaster!
 
     private enum Config {
-        static let filterTime: TimeInterval = 1 * 60 // Before edit this was 4.75
+        static let filterTime: TimeInterval = 4.5 * 60
     }
 
     init(resolver: Resolver) {
@@ -83,13 +83,11 @@ final class BaseGlucoseStorage: GlucoseStorage, Injectable {
     }
 
     func isGlucoseNotFlat() -> Bool {
-        return true // To completely avoid more "To Flat" errors
-
-        let last5 = recent().suffix(5)
-        guard last5.count == 5 else { return true }
+        let last3 = recent().suffix(3)
+        guard last3.count == 3 else { return true }
 
         return Array(
-            last5
+            last3
                 .compactMap { $0.filtered ?? 0 }
                 .filter { $0 != 0 }
                 .uniqued()

+ 0 - 17
FreeAPS/Sources/Application/FreeAPSApp.swift

@@ -49,20 +49,3 @@ import Swinject
         }
     }
 }
-
-class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate {
-    func userNotificationCenter(
-        _: UNUserNotificationCenter,
-        willPresent _: UNNotification,
-        withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions)
-            -> Void
-    ) {
-        completionHandler([.banner, .badge, .sound])
-    }
-
-    func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
-        UNUserNotificationCenter.current().delegate = self
-        return true
-    }
-}

+ 1 - 1
FreeAPS/Sources/Config/Config.swift

@@ -4,6 +4,6 @@ import SwiftDate
 enum Config {
     static let treatWarningsAsErrors = true
     static let withSignPosts = false
-    static let loopInterval = 2.minutes.timeInterval
+    static let loopInterval = 5.minutes.timeInterval
     static let eхpirationInterval = 10.minutes.timeInterval
 }

+ 0 - 2
FreeAPS/Sources/Helpers/Color+Extensions.swift

@@ -4,12 +4,10 @@ extension Color {
     static let loopGray = Color("LoopGray")
     static let loopGreen = Color("LoopGreen")
     static let loopYellow = Color("LoopYellow")
-    static let loopOrange = Color("LoopOrange")
     static let loopRed = Color("LoopRed")
     static let insulin = Color("Insulin")
     static let uam = Color("UAM")
     static let zt = Color("ZT")
     static let tempBasal = Color("TempBasal")
     static let basal = Color("Basal")
-    static let backgroundColor = Color("Background")
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 118
FreeAPS/Sources/Localizations/Descriptions/ar.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 133
FreeAPS/Sources/Localizations/Descriptions/ca.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 118
FreeAPS/Sources/Localizations/Descriptions/da.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 118
FreeAPS/Sources/Localizations/Descriptions/de.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 133
FreeAPS/Sources/Localizations/Descriptions/el.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 133
FreeAPS/Sources/Localizations/Descriptions/en.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 118
FreeAPS/Sources/Localizations/Descriptions/es.lproj/Descriptions.strings


Разница между файлами не показана из-за своего большого размера
+ 0 - 118
FreeAPS/Sources/Localizations/Descriptions/fi.lproj/Descriptions.strings


+ 0 - 0
FreeAPS/Sources/Localizations/Descriptions/fr.lproj/Descriptions.strings


Некоторые файлы не были показаны из-за большого количества измененных файлов