Skip to content

Shared state #202

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

Open
mbrandonw wants to merge 82 commits into
base: main
Choose a base branch
from
Open

Shared state #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
c8ded4e
Bump
stephencelis Dec 7, 2023
bf0c97a
wip
stephencelis Dec 7, 2023
84fb895
wip
stephencelis Dec 7, 2023
7a12f8b
wip
stephencelis Dec 8, 2023
e67c0c9
wip
stephencelis Dec 8, 2023
5b24ecf
wip
stephencelis Dec 8, 2023
015932b
wip
stephencelis Dec 8, 2023
57d676d
wip
stephencelis Dec 8, 2023
816d53f
wip
stephencelis Dec 8, 2023
286618f
wip
stephencelis Dec 8, 2023
49df034
wip
stephencelis Dec 8, 2023
0c5270b
wip
stephencelis Dec 8, 2023
852d16c
wip
stephencelis Dec 8, 2023
39c9bb7
wip
stephencelis Dec 8, 2023
19c35f6
wip
stephencelis Dec 8, 2023
fda7be3
wip
stephencelis Dec 8, 2023
3e5a8aa
wip
stephencelis Dec 8, 2023
810fcf3
wip
stephencelis Dec 8, 2023
0932033
wip
stephencelis Dec 8, 2023
4db019c
wip
stephencelis Dec 8, 2023
7b9ae18
wip
stephencelis Dec 8, 2023
70b7e3b
wip
stephencelis Dec 8, 2023
d7da8fc
wip
stephencelis Dec 8, 2023
27e4812
wip
stephencelis Dec 8, 2023
efa9f2b
wip
stephencelis Dec 8, 2023
716bf9c
wip
stephencelis Dec 8, 2023
0aaa62e
wip
stephencelis Dec 8, 2023
7e009ff
wip
stephencelis Dec 8, 2023
de50bc5
wip
stephencelis Dec 8, 2023
319387e
wip
stephencelis Dec 8, 2023
c2f288f
wip
stephencelis Dec 8, 2023
be08617
wip
stephencelis Dec 8, 2023
8abe58f
wip
stephencelis Dec 8, 2023
4a1b154
Merge remote-tracking branch 'origin/main' into observation-beta
stephencelis Dec 8, 2023
f59b3de
wip
stephencelis Dec 8, 2023
e57166f
wip
stephencelis Dec 9, 2023
8a8ff1f
wip
stephencelis Dec 9, 2023
a34be6f
wip
stephencelis Dec 9, 2023
380ce12
wip
stephencelis Dec 9, 2023
eb75020
wip
stephencelis Dec 9, 2023
2fc8dc6
wip
stephencelis Dec 9, 2023
5233f32
wip
stephencelis Dec 9, 2023
cf5f10e
wip
stephencelis Dec 9, 2023
eab3475
wip
stephencelis Dec 9, 2023
2a30738
wip
stephencelis Dec 9, 2023
0740836
wip
stephencelis Dec 9, 2023
db145d3
wip
stephencelis Dec 9, 2023
fa6251d
wip
stephencelis Dec 9, 2023
fd47050
wip
stephencelis Dec 9, 2023
29fae99
Merge branch 'main' into observation-beta
stephencelis Jan 10, 2024
7199286
wip
stephencelis Jan 10, 2024
bc41412
wip
stephencelis Jan 25, 2024
cee0c1c
Merge remote-tracking branch 'origin/main' into observation-beta
stephencelis Jan 25, 2024
098df9f
wip
stephencelis Jan 25, 2024
03716cf
wip
stephencelis Jan 25, 2024
b354ff4
Merge remote-tracking branch 'origin/main' into observation-beta
mbrandonw Apr 6, 2024
9540d86
User @Shared for user settings.
mbrandonw Apr 6, 2024
d39632d
Remove firstLaunchOnboarding (#198)
imjn Jan 25, 2024
07e5628
Merge remote-tracking branch 'origin/main' into observation-beta
mbrandonw Apr 7, 2024
bc78ed5
Merge remote-tracking branch 'origin/observation-beta' into shared-st…
mbrandonw Apr 7, 2024
7f5df02
wip
mbrandonw Apr 7, 2024
b535a49
wip
mbrandonw Apr 7, 2024
b2d23a7
wip
mbrandonw Apr 7, 2024
beeda8f
use enum reducers
mbrandonw Apr 7, 2024
29d1884
fix some warnings
mbrandonw Apr 7, 2024
49aa5bc
Merge remote-tracking branch 'origin/observation-beta' into shared-st…
mbrandonw Apr 7, 2024
78c560f
move savedGames to @Shared
mbrandonw Apr 7, 2024
e00f0e1
wip
mbrandonw Apr 7, 2024
e3911e8
wip
mbrandonw Apr 8, 2024
6479c12
wip
mbrandonw Apr 8, 2024
1f09da3
more updates
mbrandonw Apr 8, 2024
7ca24cc
move lower power mode stuff to @share
mbrandonw Apr 9, 2024
1fe709a
Merge remote-tracking branch 'origin/main' into shared-state-beta
mbrandonw Apr 10, 2024
199bc60
fixes
mbrandonw Apr 10, 2024
d735963
Merge remote-tracking branch 'origin/main' into shared-state-beta
mbrandonw Apr 10, 2024
2d998cb
wip
mbrandonw Apr 14, 2024
8811b9c
clean up
mbrandonw Apr 14, 2024
4114ce0
clean up
mbrandonw Apr 14, 2024
d7e67a0
clean up
mbrandonw Apr 14, 2024
bc53d51
wip
mbrandonw Apr 14, 2024
57e74cf
wip
mbrandonw Apr 14, 2024
b6e5a89
wip
mbrandonw Apr 19, 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
67 changes: 67 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/DailyChallengeHelpers.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DailyChallengeHelpers"
BuildableName = "DailyChallengeHelpers"
BlueprintName = "DailyChallengeHelpers"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "DailyChallengeHelpers"
BuildableName = "DailyChallengeHelpers"
BlueprintName = "DailyChallengeHelpers"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
67 changes: 67 additions & 0 deletions .swiftpm/xcode/xcshareddata/xcschemes/UserSettings.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UserSettings"
BuildableName = "UserSettings"
BlueprintName = "UserSettings"
ReferencedContainer = "container:">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "UserSettings"
BuildableName = "UserSettings"
BlueprintName = "UserSettings"
ReferencedContainer = "container:">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
1 change: 0 additions & 1 deletion App/Previews/CubeCorePreview/CubeCorePreviewApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ struct CubeCorePreviewApp: App {
initialState: CubeSceneView.ViewState(
cubes: .mock,
enableGyroMotion: false,
isOnLowPowerMode: false,
nub: nil,
playedWords: [],
selectedFaceCount: 0,
Expand Down
1 change: 0 additions & 1 deletion App/Previews/CubePreviewPreview/CubePreviewPreviewApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ struct CubePreviewPreviewApp: App {
store: Store(
initialState: CubePreview.State(
cubes: .mock,
isOnLowPowerMode: false,
moveIndex: 0,
moves: [
.init(
Expand Down
1 change: 0 additions & 1 deletion App/Previews/GameOverPreview/GameOverPreviewApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ extension StoreOf<GameOver> {
.appendingPathComponent("co.pointfree.Isowords")
.appendingPathComponent("Isowords.sqlite3")
)
$0.fileClient = .noop
$0.remoteNotifications = .noop
$0.serverConfig = .noop
$0.userDefaults.boolForKey = { _ in false }
Expand Down
4 changes: 1 addition & 3 deletions App/Previews/SettingsPreview/SettingsPreviewApp.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ import ApiClient
import AudioPlayerClient
import ComposableStoreKit
import ComposableUserNotifications
import FileClient
import RemoteNotificationsClient
import ServerConfigClient
import ServerConfigPersistenceKey
import SettingsFeature
import Styleguide
import SwiftUI
import UserDefaultsClient

@main
struct SettingsPreviewApp: App {
Expand Down
14 changes: 1 addition & 13 deletions App/iOS/App.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Build
import ComposableArchitecture
import DictionarySqliteClient
import ServerConfig
import ServerConfigClient
import ServerConfigPersistenceKey
import Styleguide
import SwiftUI
import UIApplicationClient
Expand All @@ -25,7 +25,6 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
.appendingPathComponent("co.pointfree.Isowords")
.appendingPathComponent("Isowords.sqlite3")
)
$0.serverConfig = .live(apiClient: $0.apiClient, build: $0.build)
}
}

Expand Down Expand Up @@ -74,14 +73,3 @@ struct IsowordsApp: App {
extension AudioPlayerClient {
static let liveValue = Self.live(bundles: [AppAudioLibrary.bundle, AppClipAudioLibrary.bundle])
}

extension ServerConfigClient {
static func live(apiClient: ApiClient, build: Build) -> Self {
.live(
fetch: {
try await apiClient
.apiRequest(route: .config(build: build.number()), as: ServerConfig.self)
}
)
}
}
2 changes: 1 addition & 1 deletion App/isowords.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
<true/>
</dict>
</plist>
6 changes: 3 additions & 3 deletions App/isowords.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

140 changes: 70 additions & 70 deletions App/isowords.xcodeproj/xcshareddata/xcschemes/isowords.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,76 @@
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "LeaderboardFeatureTests"
BuildableName = "LeaderboardFeatureTests"
BlueprintName = "LeaderboardFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "MultiplayerFeatureTests"
BuildableName = "MultiplayerFeatureTests"
BlueprintName = "MultiplayerFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "OnboardingFeatureTests"
BuildableName = "OnboardingFeatureTests"
BlueprintName = "OnboardingFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SettingsFeatureTests"
BuildableName = "SettingsFeatureTests"
BlueprintName = "SettingsFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ServerRouterTests"
BuildableName = "ServerRouterTests"
BlueprintName = "ServerRouterTests"
ReferencedContainer = "container:..">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand Down Expand Up @@ -210,56 +280,6 @@
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "LeaderboardFeatureTests"
BuildableName = "LeaderboardFeatureTests"
BlueprintName = "LeaderboardFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "MultiplayerFeatureTests"
BuildableName = "MultiplayerFeatureTests"
BlueprintName = "MultiplayerFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "OnboardingFeatureTests"
BuildableName = "OnboardingFeatureTests"
BlueprintName = "OnboardingFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "SettingsFeatureTests"
BuildableName = "SettingsFeatureTests"
BlueprintName = "SettingsFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ServerRouterTests"
BuildableName = "ServerRouterTests"
BlueprintName = "ServerRouterTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
Expand All @@ -280,26 +300,6 @@
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppFeatureTests"
BuildableName = "AppFeatureTests"
BlueprintName = "AppFeatureTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "AppStoreSnapshotTests"
BuildableName = "AppStoreSnapshotTests"
BlueprintName = "AppStoreSnapshotTests"
ReferencedContainer = "container:..">
</BuildableReference>
</TestableReference>
<TestableReference
skipped = "NO">
<BuildableReference
Expand Down
Loading