Skip to content

Commit 37e2f5a

Browse files
xan-mxan-m
committed
Merge branch 'stepCounter'
Conflicts: InfiniLink.xcodeproj/project.pbxproj InfiniLink/BLE/BLEManager.swift
2 parents 0a48319 + 7e5b816 commit 37e2f5a

56 files changed

Lines changed: 1009 additions & 25 deletions

Some content is hidden

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

‎InfiniLink.xcodeproj/project.pbxproj‎

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

99
/* Begin PBXBuildFile section */
1010
2601AF632721D0BF00D999EF /* InfiniLink.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 2601AF612721D0BF00D999EF /* InfiniLink.xcdatamodeld */; };
11+
2601AF6727220CED00D999EF /* StepsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601AF6627220CED00D999EF /* StepsView.swift */; };
12+
2601AF6A2722110700D999EF /* StepProgressGauge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2601AF692722110700D999EF /* StepProgressGauge.swift */; };
1113
2617EF37270364CE00FE6F48 /* ChartViewSelector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2617EF36270364CE00FE6F48 /* ChartViewSelector.swift */; };
1214
2617EF3927036C9B00FE6F48 /* WhatsNewSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2617EF3827036C9B00FE6F48 /* WhatsNewSheet.swift */; };
1315
2617EF3D27036DC600FE6F48 /* WhatsNewBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2617EF3C27036DC600FE6F48 /* WhatsNewBody.swift */; };
@@ -18,6 +20,9 @@
1820
2632388C26F265B100D72B43 /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2632388B26F265B100D72B43 /* MainView.swift */; };
1921
2632388E26F297CB00D72B43 /* OnboardingBody.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2632388D26F297CB00D72B43 /* OnboardingBody.swift */; };
2022
2632389026F2980A00D72B43 /* OnboardingDismissButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2632388F26F2980A00D72B43 /* OnboardingDismissButton.swift */; };
23+
263462EA2729B71500D3278D /* StepCalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263462E92729B71500D3278D /* StepCalendarView.swift */; };
24+
263462ED2729F68600D3278D /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263462EC2729F68600D3278D /* CalendarView.swift */; };
25+
263462EF2729F6C000D3278D /* CalendarViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263462EE2729F6C000D3278D /* CalendarViewExtensions.swift */; };
2126
263B20B526CD673900676BF0 /* ChartTabs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20B426CD673900676BF0 /* ChartTabs.swift */; };
2227
263B20BA26CDF13400676BF0 /* HeartChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20B926CDF13400676BF0 /* HeartChart.swift */; };
2328
263B20BC26CDF20400676BF0 /* BatteryChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 263B20BB26CDF20400676BF0 /* BatteryChart.swift */; };
@@ -43,9 +48,11 @@
4348
266F53E626FA7676007481A6 /* HomeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 266F53E526FA7676007481A6 /* HomeScreen.swift */; };
4449
266F53EA26FA91F3007481A6 /* DeviceInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 266F53E926FA91F3007481A6 /* DeviceInfo.swift */; };
4550
2675CA5A26DC81AA00967E4D /* DFUComplete.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2675CA5926DC81AA00967E4D /* DFUComplete.swift */; };
51+
267C2EF8273C8AB300F464B0 /* StepWeeklyGraph.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267C2EF7273C8AB300F464B0 /* StepWeeklyGraph.swift */; };
4652
268E773C27174A2B000DF90D /* ChartSettingsSheetMain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 268E773B27174A2B000DF90D /* ChartSettingsSheetMain.swift */; };
4753
268E773F27174B8B000DF90D /* ChartSettingsSheetSliders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 268E773E27174B8B000DF90D /* ChartSettingsSheetSliders.swift */; };
4854
268E774127175830000DF90D /* ChartSettingsSheetDatePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 268E774027175830000DF90D /* ChartSettingsSheetDatePicker.swift */; };
55+
26914730272A09D8004A61BD /* StepCountPersistenceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2691472F272A09D8004A61BD /* StepCountPersistenceManager.swift */; };
4956
26A40E852704E6F3007966F6 /* SheetManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40E842704E6F3007966F6 /* SheetManager.swift */; };
5057
26A40E892704E97C007966F6 /* DebugViewBLE.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40E882704E97C007966F6 /* DebugViewBLE.swift */; };
5158
26A40E8B2704EB22007966F6 /* DebugViewDFU.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26A40E8A2704EB22007966F6 /* DebugViewDFU.swift */; };
@@ -95,6 +102,8 @@
95102

96103
/* Begin PBXFileReference section */
97104
2601AF622721D0BF00D999EF /* InfiniLink.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = InfiniLink.xcdatamodel; sourceTree = "<group>"; };
105+
2601AF6627220CED00D999EF /* StepsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepsView.swift; sourceTree = "<group>"; };
106+
2601AF692722110700D999EF /* StepProgressGauge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepProgressGauge.swift; sourceTree = "<group>"; };
98107
2617EF36270364CE00FE6F48 /* ChartViewSelector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartViewSelector.swift; sourceTree = "<group>"; };
99108
2617EF3827036C9B00FE6F48 /* WhatsNewSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhatsNewSheet.swift; sourceTree = "<group>"; };
100109
2617EF3C27036DC600FE6F48 /* WhatsNewBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WhatsNewBody.swift; sourceTree = "<group>"; };
@@ -105,6 +114,9 @@
105114
2632388B26F265B100D72B43 /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
106115
2632388D26F297CB00D72B43 /* OnboardingBody.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingBody.swift; sourceTree = "<group>"; };
107116
2632388F26F2980A00D72B43 /* OnboardingDismissButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingDismissButton.swift; sourceTree = "<group>"; };
117+
263462E92729B71500D3278D /* StepCalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepCalendarView.swift; sourceTree = "<group>"; };
118+
263462EC2729F68600D3278D /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = "<group>"; };
119+
263462EE2729F6C000D3278D /* CalendarViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarViewExtensions.swift; sourceTree = "<group>"; };
108120
263B20B426CD673900676BF0 /* ChartTabs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartTabs.swift; sourceTree = "<group>"; };
109121
263B20B926CDF13400676BF0 /* HeartChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeartChart.swift; sourceTree = "<group>"; };
110122
263B20BB26CDF20400676BF0 /* BatteryChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BatteryChart.swift; sourceTree = "<group>"; };
@@ -136,9 +148,11 @@
136148
266F53E526FA7676007481A6 /* HomeScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeScreen.swift; sourceTree = "<group>"; };
137149
266F53E926FA91F3007481A6 /* DeviceInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeviceInfo.swift; sourceTree = "<group>"; };
138150
2675CA5926DC81AA00967E4D /* DFUComplete.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DFUComplete.swift; sourceTree = "<group>"; };
151+
267C2EF7273C8AB300F464B0 /* StepWeeklyGraph.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepWeeklyGraph.swift; sourceTree = "<group>"; };
139152
268E773B27174A2B000DF90D /* ChartSettingsSheetMain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartSettingsSheetMain.swift; sourceTree = "<group>"; };
140153
268E773E27174B8B000DF90D /* ChartSettingsSheetSliders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartSettingsSheetSliders.swift; sourceTree = "<group>"; };
141154
268E774027175830000DF90D /* ChartSettingsSheetDatePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChartSettingsSheetDatePicker.swift; sourceTree = "<group>"; };
155+
2691472F272A09D8004A61BD /* StepCountPersistenceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepCountPersistenceManager.swift; sourceTree = "<group>"; };
142156
26A40E842704E6F3007966F6 /* SheetManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SheetManager.swift; sourceTree = "<group>"; };
143157
26A40E882704E97C007966F6 /* DebugViewBLE.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugViewBLE.swift; sourceTree = "<group>"; };
144158
26A40E8A2704EB22007966F6 /* DebugViewDFU.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DebugViewDFU.swift; sourceTree = "<group>"; };
@@ -195,6 +209,16 @@
195209
/* End PBXFrameworksBuildPhase section */
196210

197211
/* Begin PBXGroup section */
212+
2601AF68272210EB00D999EF /* Steps View Components */ = {
213+
isa = PBXGroup;
214+
children = (
215+
2601AF692722110700D999EF /* StepProgressGauge.swift */,
216+
267C2EF7273C8AB300F464B0 /* StepWeeklyGraph.swift */,
217+
263462EB2729F64600D3278D /* StepCalendar */,
218+
);
219+
path = "Steps View Components";
220+
sourceTree = "<group>";
221+
};
198222
2617EF3A27036D9100FE6F48 /* What's New */ = {
199223
isa = PBXGroup;
200224
children = (
@@ -214,6 +238,16 @@
214238
path = Onboarding;
215239
sourceTree = "<group>";
216240
};
241+
263462EB2729F64600D3278D /* StepCalendar */ = {
242+
isa = PBXGroup;
243+
children = (
244+
263462E92729B71500D3278D /* StepCalendarView.swift */,
245+
263462EC2729F68600D3278D /* CalendarView.swift */,
246+
263462EE2729F6C000D3278D /* CalendarViewExtensions.swift */,
247+
);
248+
path = StepCalendar;
249+
sourceTree = "<group>";
250+
};
217251
263B20B626CD673D00676BF0 /* Chart View Components */ = {
218252
isa = PBXGroup;
219253
children = (
@@ -316,6 +350,8 @@
316350
26A40EE6270A1F78007966F6 /* Home View */,
317351
264DB80A26C62ED600E812C3 /* SideMenu.swift */,
318352
26F426EE26C72D7D00D0866B /* ChartView.swift */,
353+
2601AF6627220CED00D999EF /* StepsView.swift */,
354+
2601AF68272210EB00D999EF /* Steps View Components */,
319355
26D7816F26CA004B00BBF555 /* SettingsView.swift */,
320356
26A40E942708C7F8007966F6 /* ScanningPopover.swift */,
321357
26A40E872704E964007966F6 /* Debug View */,
@@ -437,6 +473,7 @@
437473
264AE04527026BD6001504A7 /* UptimeManager.swift */,
438474
26D7817926CAD19F00BBF555 /* ColorPalette.swift */,
439475
26C5FAD426FBB76100921207 /* DeviceNameManager.swift */,
476+
2691472F272A09D8004A61BD /* StepCountPersistenceManager.swift */,
440477
);
441478
path = Utilities;
442479
sourceTree = "<group>";
@@ -591,6 +628,7 @@
591628
26A6316026C4BC25005AE404 /* DFUView.swift in Sources */,
592629
26A40E8F270509BA007966F6 /* DebugViewShareButton.swift in Sources */,
593630
2617EF3927036C9B00FE6F48 /* WhatsNewSheet.swift in Sources */,
631+
263462EA2729B71500D3278D /* StepCalendarView.swift in Sources */,
594632
26A40E892704E97C007966F6 /* DebugViewBLE.swift in Sources */,
595633
2632389026F2980A00D72B43 /* OnboardingDismissButton.swift in Sources */,
596634
264AE04627026BD6001504A7 /* UptimeManager.swift in Sources */,
@@ -612,26 +650,32 @@
612650
264DB80D26C633CF00E812C3 /* PageSwitcher.swift in Sources */,
613651
264BFE4226BC51CE0050A223 /* InfiniLinkApp.swift in Sources */,
614652
26A40E8B2704EB22007966F6 /* DebugViewDFU.swift in Sources */,
653+
263462ED2729F68600D3278D /* CalendarView.swift in Sources */,
615654
263F56E026F13E760001BA4F /* DebugManager.swift in Sources */,
616655
26C5FAD826FC129400921207 /* ArbitraryNotificationView.swift in Sources */,
617656
2617EF3D27036DC600FE6F48 /* WhatsNewBody.swift in Sources */,
618657
26A40E952708C7F8007966F6 /* ScanningPopover.swift in Sources */,
619658
264BFE7626BC52720050A223 /* HexStringToData.swift in Sources */,
620659
2632388626F2548600D72B43 /* DFUWithoutBLE.swift in Sources */,
660+
26914730272A09D8004A61BD /* StepCountPersistenceManager.swift in Sources */,
621661
26C5FADC26FE7EB000921207 /* SheetCloseButton.swift in Sources */,
622662
26C5FAE326FEB0A400921207 /* DFUDownloadView.swift in Sources */,
623663
2632388A26F2591900D72B43 /* DFUStartTransferButton.swift in Sources */,
624664
2675CA5A26DC81AA00967E4D /* DFUComplete.swift in Sources */,
625665
263B20BC26CDF20400676BF0 /* BatteryChart.swift in Sources */,
666+
2601AF6727220CED00D999EF /* StepsView.swift in Sources */,
626667
2644261226DC093D009BD54A /* SetTime.swift in Sources */,
668+
263462EF2729F6C000D3278D /* CalendarViewExtensions.swift in Sources */,
627669
266F53E626FA7676007481A6 /* HomeScreen.swift in Sources */,
628670
268E774127175830000DF90D /* ChartSettingsSheetDatePicker.swift in Sources */,
629671
263B20B526CD673900676BF0 /* ChartTabs.swift in Sources */,
630672
26D7816E26CA003B00BBF555 /* SettingsFunctions.swift in Sources */,
673+
2601AF6A2722110700D999EF /* StepProgressGauge.swift in Sources */,
631674
26A6316326C4C6D6005AE404 /* BLEConnectView.swift in Sources */,
632675
2617EF37270364CE00FE6F48 /* ChartViewSelector.swift in Sources */,
633676
26A40E8D2704EB32007966F6 /* DebugViewApp.swift in Sources */,
634677
26D7816526C9EB3800BBF555 /* BLEDelegates.swift in Sources */,
678+
267C2EF8273C8AB300F464B0 /* StepWeeklyGraph.swift in Sources */,
635679
26C5FAD526FBB76100921207 /* DeviceNameManager.swift in Sources */,
636680
26A6315B26C49841005AE404 /* DFU.swift in Sources */,
637681
26D7817A26CAD19F00BBF555 /* ColorPalette.swift in Sources */,
@@ -793,10 +837,11 @@
793837
264BFE6926BC51CF0050A223 /* Debug */ = {
794838
isa = XCBuildConfiguration;
795839
buildSettings = {
796-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
840+
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
797841
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
842+
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
798843
CODE_SIGN_STYLE = Automatic;
799-
CURRENT_PROJECT_VERSION = 1;
844+
CURRENT_PROJECT_VERSION = 2;
800845
DEVELOPMENT_ASSET_PATHS = "\"InfiniLink/Preview Content\"";
801846
DEVELOPMENT_TEAM = 99BHY6DC82;
802847
ENABLE_PREVIEWS = YES;
@@ -806,7 +851,7 @@
806851
"$(inherited)",
807852
"@executable_path/Frameworks",
808853
);
809-
MARKETING_VERSION = 0.9.2;
854+
MARKETING_VERSION = 0.9.3;
810855
PRODUCT_BUNDLE_IDENTIFIER = "com.alexemry.Infini-iOS";
811856
PRODUCT_NAME = "$(TARGET_NAME)";
812857
SWIFT_VERSION = 5.0;
@@ -817,10 +862,11 @@
817862
264BFE6A26BC51CF0050A223 /* Release */ = {
818863
isa = XCBuildConfiguration;
819864
buildSettings = {
820-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
865+
ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2";
821866
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
867+
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
822868
CODE_SIGN_STYLE = Automatic;
823-
CURRENT_PROJECT_VERSION = 1;
869+
CURRENT_PROJECT_VERSION = 2;
824870
DEVELOPMENT_ASSET_PATHS = "\"InfiniLink/Preview Content\"";
825871
DEVELOPMENT_TEAM = 99BHY6DC82;
826872
ENABLE_PREVIEWS = YES;
@@ -830,7 +876,7 @@
830876
"$(inherited)",
831877
"@executable_path/Frameworks",
832878
);
833-
MARKETING_VERSION = 0.9.2;
879+
MARKETING_VERSION = 0.9.3;
834880
PRODUCT_BUNDLE_IDENTIFIER = "com.alexemry.Infini-iOS";
835881
PRODUCT_NAME = "$(TARGET_NAME)";
836882
SWIFT_VERSION = 5.0;

‎InfiniLink/Assets.xcassets/AppIcon-1.appiconset/Contents.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "iphone",
5+
"scale" : "2x",
6+
"size" : "20x20"
7+
},
8+
{
9+
"idiom" : "iphone",
10+
"scale" : "3x",
11+
"size" : "20x20"
12+
},
13+
{
14+
"idiom" : "iphone",
15+
"scale" : "2x",
16+
"size" : "29x29"
17+
},
18+
{
19+
"idiom" : "iphone",
20+
"scale" : "3x",
21+
"size" : "29x29"
22+
},
23+
{
24+
"idiom" : "iphone",
25+
"scale" : "2x",
26+
"size" : "40x40"
27+
},
28+
{
29+
"idiom" : "iphone",
30+
"scale" : "3x",
31+
"size" : "40x40"
32+
},
33+
{
34+
"idiom" : "iphone",
35+
"scale" : "2x",
36+
"size" : "60x60"
37+
},
38+
{
39+
"idiom" : "iphone",
40+
"scale" : "3x",
41+
"size" : "60x60"
42+
},
43+
{
44+
"idiom" : "ios-marketing",
45+
"scale" : "1x",
46+
"size" : "1024x1024"
47+
}
48+
],
49+
"info" : {
50+
"author" : "xcode",
51+
"version" : 1
52+
}
53+
}

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/100.png‎

4.71 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/1024.png‎

159 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/114.png‎

5.59 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/120.png‎

5.79 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/128.png‎

6.52 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/144.png‎

7.47 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/152.png‎

7.87 KB
Loading

‎InfiniLink/Assets.xcassets/AppIcon-2.appiconset/16.png‎

773 Bytes
Loading

0 commit comments

Comments
 (0)