Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Remove heatmap #62

Merged
merged 18 commits into from
Sep 8, 2024
Merged

Remove heatmap #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
480bdee
remove heatmap view since bottomless AES encrypted that data
drewvolz Sep 8, 2024
dacadba
inline titles
drewvolz Sep 8, 2024
d6c1863
remove maps that have no impact
drewvolz Sep 8, 2024
a9e26e2
remove @Sendable
drewvolz Sep 8, 2024
8f7be17
set a bunch of subheadline font on section headers
drewvolz Sep 8, 2024
7618612
remove gift image from free bag
drewvolz Sep 8, 2024
7813a5b
bubble up errors from combine when logging in
drewvolz Sep 8, 2024
667af38
bump runner to Xcode 15
drewvolz Sep 8, 2024
3195a00
bump runner to 15.2
drewvolz Sep 8, 2024
abdf519
ignore .ds_store
drewvolz Sep 8, 2024
7a65e2e
finish removing CalendarHeatmap dependency
drewvolz Sep 8, 2024
3193cb0
xcode wants to update the icon assets json
drewvolz Sep 8, 2024
f42ec45
xcode forgot the schemes?
drewvolz Sep 8, 2024
52c0731
Revert "remove @Sendable"
drewvolz Sep 8, 2024
3c08ce5
update tables to collectionViews because swiftui likes to play games
drewvolz Sep 8, 2024
280bf86
remove last of scale consumption heatmap constants and test check
drewvolz Sep 8, 2024
aa5ed2d
poke schemes
drewvolz Sep 8, 2024
415538e
poke schemes
drewvolz Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ jobs:
- name: Build and Test
uses: mxcl/xcodebuild@v1
with:
xcode: 13.0
xcode: 15.2
scheme: "Bottomless"
platform: ${{ matrix.platform }}
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ xcuserdata/
*.moved-aside
*.xccheckout
*.xcscmblueprint
.DS_Store

## Obj-C/Swift specific
*.hmap
Expand Down
31 changes: 1 addition & 30 deletions Bottomless.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -39,11 +39,7 @@
3A858C9624AD05B900F535D2 /* NoOrdersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A858C9524AD05B900F535D2 /* NoOrdersView.swift */; };
3A9B492128A9F6E80062D078 /* EncodedString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3A9B492028A9F6E80062D078 /* EncodedString.swift */; };
3A9B492428A9F84A0062D078 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD9270724972CB1000AEFC8 /* String.swift */; };
3AAADFC925931F2A003A0A09 /* CleanDataResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAADFC825931F2A003A0A09 /* CleanDataResponse.swift */; };
3AAADFCD25932234003A0A09 /* clean-data.json in Resources */ = {isa = PBXBuildFile; fileRef = 3AAADFCC25932234003A0A09 /* clean-data.json */; };
3AAADFD1259322B9003A0A09 /* CleanDataViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAADFD0259322B9003A0A09 /* CleanDataViewModel.swift */; };
3AAADFD525932819003A0A09 /* CalendarHeatmap in Frameworks */ = {isa = PBXBuildFile; productRef = 3AAADFD425932819003A0A09 /* CalendarHeatmap */; };
3AAADFDD25932FD1003A0A09 /* HeatmapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAADFDC25932FD1003A0A09 /* HeatmapView.swift */; };
3AAADFE32593E819003A0A09 /* Date.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAADFE22593E819003A0A09 /* Date.swift */; };
3AAF07FA262CCE550036578A /* BottomlessUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAF07F9262CCE550036578A /* BottomlessUITests.swift */; };
3AAF0804262CD1DE0036578A /* Keys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AAF0803262CD1DE0036578A /* Keys.swift */; };
Expand Down Expand Up @@ -157,10 +153,7 @@
3A73055A24D36DC700E71882 /* AutomaticOrderingToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutomaticOrderingToggle.swift; sourceTree = "<group>"; };
3A858C9524AD05B900F535D2 /* NoOrdersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoOrdersView.swift; sourceTree = "<group>"; };
3A9B492028A9F6E80062D078 /* EncodedString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncodedString.swift; sourceTree = "<group>"; };
3AAADFC825931F2A003A0A09 /* CleanDataResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CleanDataResponse.swift; sourceTree = "<group>"; };
3AAADFCC25932234003A0A09 /* clean-data.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "clean-data.json"; sourceTree = "<group>"; };
3AAADFD0259322B9003A0A09 /* CleanDataViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CleanDataViewModel.swift; sourceTree = "<group>"; };
3AAADFDC25932FD1003A0A09 /* HeatmapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeatmapView.swift; sourceTree = "<group>"; };
3AAADFE22593E819003A0A09 /* Date.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Date.swift; sourceTree = "<group>"; };
3AAF07F7262CCE550036578A /* BottomlessUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BottomlessUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3AAF07F9262CCE550036578A /* BottomlessUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomlessUITests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -247,7 +240,6 @@
files = (
3AD926CB2491CA7A000AEFC8 /* KeychainSwift in Frameworks */,
3A6A97DA252E63240071DBB9 /* SwiftUICharts in Frameworks */,
3AAADFD525932819003A0A09 /* CalendarHeatmap in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -422,7 +414,6 @@
3AD9272524981A85000AEFC8 /* OrdersViewModel.swift */,
3AD9272924985D40000AEFC8 /* RecordsViewModel.swift */,
3AD927352498B954000AEFC8 /* ScaleViewModel.swift */,
3AAADFD0259322B9003A0A09 /* CleanDataViewModel.swift */,
3AD9273D24996059000AEFC8 /* CreditsViewModel.swift */,
3A0458D72499775300366F10 /* AccountViewModel.swift */,
3A0458FF249E13DE00366F10 /* OrderingStrategyViewModel.swift */,
Expand All @@ -441,7 +432,6 @@
3A0458D524996F2400366F10 /* AccountResponse.swift */,
3AD9273B24996010000AEFC8 /* CreditsResponse.swift */,
3AD9272C24985DF7000AEFC8 /* RecordsResponse.swift */,
3AAADFC825931F2A003A0A09 /* CleanDataResponse.swift */,
3AD927332498B8B4000AEFC8 /* ScaleResponse.swift */,
3AD9271A2497F84F000AEFC8 /* UpNextResponse.swift */,
3AD926F924943500000AEFC8 /* InTransitionResponse.swift */,
Expand Down Expand Up @@ -511,7 +501,6 @@
children = (
3AD926F224942D0B000AEFC8 /* DataView.swift */,
3A46478924AD1CE500B9D4B5 /* ScaleView.swift */,
3AAADFDC25932FD1003A0A09 /* HeatmapView.swift */,
);
path = DataView;
sourceTree = "<group>";
Expand Down Expand Up @@ -619,7 +608,6 @@
packageProductDependencies = (
3AD926CA2491CA7A000AEFC8 /* KeychainSwift */,
3A6A97D9252E63240071DBB9 /* SwiftUICharts */,
3AAADFD425932819003A0A09 /* CalendarHeatmap */,
);
productName = Bottomless;
productReference = 3AD9268E2491547E000AEFC8 /* Bottomless.app */;
Expand Down Expand Up @@ -656,7 +644,6 @@
packageReferences = (
3AD926C92491CA7A000AEFC8 /* XCRemoteSwiftPackageReference "keychain-swift" */,
3A6A97D8252E63240071DBB9 /* XCRemoteSwiftPackageReference "SwiftUICharts" */,
3AAADFD325932819003A0A09 /* XCRemoteSwiftPackageReference "CalendarHeatmap" */,
);
productRefGroup = 3AD9268F2491547E000AEFC8 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -752,7 +739,6 @@
3A0458FE249E11BC00366F10 /* OrderingStrategyView.swift in Sources */,
3AD9270D24973FE1000AEFC8 /* MockData.swift in Sources */,
3AD9272D24985DF7000AEFC8 /* RecordsResponse.swift in Sources */,
3AAADFC925931F2A003A0A09 /* CleanDataResponse.swift in Sources */,
3AD926BA24915774000AEFC8 /* Store.swift in Sources */,
3AD926D924932904000AEFC8 /* AuthKeys.swift in Sources */,
3A6A950424C13F410053DF8C /* ListModifiers.swift in Sources */,
Expand All @@ -771,13 +757,11 @@
3AD9272624981A85000AEFC8 /* OrdersViewModel.swift in Sources */,
3A0458F4249CA37F00366F10 /* SettingsSegmentView.swift in Sources */,
3AAF0804262CD1DE0036578A /* Keys.swift in Sources */,
3AAADFD1259322B9003A0A09 /* CleanDataViewModel.swift in Sources */,
3A858C9624AD05B900F535D2 /* NoOrdersView.swift in Sources */,
3AD926B124915679000AEFC8 /* Colors.swift in Sources */,
3A0458F02499D07200366F10 /* SearchDetailView.swift in Sources */,
3AD926CD2491CCE1000AEFC8 /* PasswordField.swift in Sources */,
3AF4FC6624C8E65700A61940 /* LoggedInSidebar.swift in Sources */,
3AAADFDD25932FD1003A0A09 /* HeatmapView.swift in Sources */,
3AD9273C24996010000AEFC8 /* CreditsResponse.swift in Sources */,
3A46478A24AD1CE500B9D4B5 /* ScaleView.swift in Sources */,
3AD9273924995D2E000AEFC8 /* FreeBag.swift in Sources */,
Expand Down Expand Up @@ -1072,14 +1056,6 @@
minimumVersion = 0.3.1;
};
};
3AAADFD325932819003A0A09 /* XCRemoteSwiftPackageReference "CalendarHeatmap" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Zacharysp/CalendarHeatmap";
requirement = {
branch = master;
kind = branch;
};
};
3AD926C92491CA7A000AEFC8 /* XCRemoteSwiftPackageReference "keychain-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/evgenyneu/keychain-swift.git";
Expand All @@ -1096,11 +1072,6 @@
package = 3A6A97D8252E63240071DBB9 /* XCRemoteSwiftPackageReference "SwiftUICharts" */;
productName = SwiftUICharts;
};
3AAADFD425932819003A0A09 /* CalendarHeatmap */ = {
isa = XCSwiftPackageProductDependency;
package = 3AAADFD325932819003A0A09 /* XCRemoteSwiftPackageReference "CalendarHeatmap" */;
productName = CalendarHeatmap;
};
3AD926CA2491CA7A000AEFC8 /* KeychainSwift */ = {
isa = XCSwiftPackageProductDependency;
package = 3AD926C92491CA7A000AEFC8 /* XCRemoteSwiftPackageReference "keychain-swift" */;
Expand Down
51 changes: 20 additions & 31 deletions Bottomless.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,23 @@
{
"object": {
"pins": [
{
"package": "CalendarHeatmap",
"repositoryURL": "https://github.com/Zacharysp/CalendarHeatmap",
"state": {
"branch": "master",
"revision": "dac4e0094d32ef8f4c59fecf6ed978b7b6b8d3e3",
"version": null
}
},
{
"package": "KeychainSwift",
"repositoryURL": "https://github.com/evgenyneu/keychain-swift.git",
"state": {
"branch": null,
"revision": "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
"version": "19.0.0"
}
},
{
"package": "SwiftUICharts",
"repositoryURL": "https://github.com/mecid/SwiftUICharts.git",
"state": {
"branch": null,
"revision": "6caa314f63912d37bb26fdf88ae7974747573f9b",
"version": "0.6.3"
}
"pins" : [
{
"identity" : "keychain-swift",
"kind" : "remoteSourceControl",
"location" : "https://github.com/evgenyneu/keychain-swift.git",
"state" : {
"revision" : "96fb84f45a96630e7583903bd7e08cf095c7a7ef",
"version" : "19.0.0"
}
]
},
"version": 1
},
{
"identity" : "swiftuicharts",
"kind" : "remoteSourceControl",
"location" : "https://github.com/mecid/SwiftUICharts.git",
"state" : {
"revision" : "6caa314f63912d37bb26fdf88ae7974747573f9b",
"version" : "0.6.3"
}
}
],
"version" : 2
}
89 changes: 89 additions & 0 deletions Bottomless.xcodeproj/xcshareddata/xcschemes/Bottomless.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AD9268D2491547E000AEFC8"
BuildableName = "Bottomless.app"
BlueprintName = "Bottomless"
ReferencedContainer = "container:Bottomless.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AAF07F6262CCE550036578A"
BuildableName = "BottomlessUITests.xctest"
BlueprintName = "BottomlessUITests"
ReferencedContainer = "container:Bottomless.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AD9268D2491547E000AEFC8"
BuildableName = "Bottomless.app"
BlueprintName = "Bottomless"
ReferencedContainer = "container:Bottomless.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AD9268D2491547E000AEFC8"
BuildableName = "Bottomless.app"
BlueprintName = "Bottomless"
ReferencedContainer = "container:Bottomless.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
53 changes: 53 additions & 0 deletions Bottomless.xcodeproj/xcshareddata/xcschemes/BottomlessUITests.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1510"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3AAF07F6262CCE550036578A"
BuildableName = "BottomlessUITests.xctest"
BlueprintName = "BottomlessUITests"
ReferencedContainer = "container:Bottomless.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
1 change: 0 additions & 1 deletion Bottomless/API/MockData.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ var mockUpNext: UpNextResponse = load("up-next.json")
var mockInTransition: InTransitionResponse = load("in-transition.json")
var mockOrders: OrdersResponse = load("orders.json")
var mockRecords: RecordsResultResponse = load("records.json")
var mockCleanData: CleanDataResponse = load("clean-data.json")
var mockProducts: ProductResultResponse = load("products.json")

func load<T: Decodable>(_ filename: String, as _: T.Type = T.self) -> T {
Expand Down
Loading
Loading