aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDustin Mierau <dustin@mierau.me>2023-12-20 09:43:59 -0800
committerDustin Mierau <dustin@mierau.me>2023-12-20 09:43:59 -0800
commitf58b0da88077b3129c2321b4af82b807c6d38ebf (patch)
tree20b280106770c0733059894a87844617edf8bdcf
parent980b82d42eb8e5160f0495ad6f4472b1fc649bfe (diff)
Remove HotlineState class for now. Not maintaining global state info yet.
-rw-r--r--Hotline.xcodeproj/project.pbxproj6
-rw-r--r--Hotline/Application.swift3
-rw-r--r--Hotline/HotlineState.swift24
-rw-r--r--Hotline/iOS/NewsView.swift1
4 files changed, 1 insertions, 33 deletions
diff --git a/Hotline.xcodeproj/project.pbxproj b/Hotline.xcodeproj/project.pbxproj
index 1f0dbb6..a77e83d 100644
--- a/Hotline.xcodeproj/project.pbxproj
+++ b/Hotline.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- DA0D698B2B1E5A5200C71DF5 /* HotlineState.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0D698A2B1E5A5200C71DF5 /* HotlineState.swift */; };
DA0D698D2B1E7CF700C71DF5 /* UsersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0D698C2B1E7CF700C71DF5 /* UsersView.swift */; platformFilter = ios; };
DA0D698F2B1E841600C71DF5 /* MessageBoardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0D698E2B1E841600C71DF5 /* MessageBoardView.swift */; platformFilter = ios; };
DA0D69912B1E894800C71DF5 /* FilesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA0D69902B1E894800C71DF5 /* FilesView.swift */; platformFilter = ios; };
@@ -43,7 +42,6 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
- DA0D698A2B1E5A5200C71DF5 /* HotlineState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HotlineState.swift; sourceTree = "<group>"; };
DA0D698C2B1E7CF700C71DF5 /* UsersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UsersView.swift; sourceTree = "<group>"; };
DA0D698E2B1E841600C71DF5 /* MessageBoardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageBoardView.swift; sourceTree = "<group>"; };
DA0D69902B1E894800C71DF5 /* FilesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilesView.swift; sourceTree = "<group>"; };
@@ -124,15 +122,14 @@
DA9CAFB92B126D5700CDA197 /* Hotline */ = {
isa = PBXGroup;
children = (
- DA32CD472B28EE640053B98B /* Info.plist */,
DA9CAFBA2B126D5700CDA197 /* Application.swift */,
- DA0D698A2B1E5A5200C71DF5 /* HotlineState.swift */,
DA4F2BF92B1A516F00D8ADDC /* iOS */,
DAE734F72B2E4126000C56F6 /* macOS */,
DADDB2892B22B2C60024040D /* Models */,
DABFCC262B1530AE009F40D2 /* Hotline */,
DABFCC272B1530BE009F40D2 /* Utility */,
DA9CAFC02B126D5800CDA197 /* Assets.xcassets */,
+ DA32CD472B28EE640053B98B /* Info.plist */,
DA9CAFC22B126D5800CDA197 /* Preview Content */,
);
path = Hotline;
@@ -271,7 +268,6 @@
DA43205E2B1D615600FC8843 /* ServerView.swift in Sources */,
DA0D69912B1E894800C71DF5 /* FilesView.swift in Sources */,
DAE735092B329810000C56F6 /* VisualEffectView.swift in Sources */,
- DA0D698B2B1E5A5200C71DF5 /* HotlineState.swift in Sources */,
DA7725412B21435B006C5ABB /* ObservableScrollView.swift in Sources */,
DAE734FF2B2E6750000C56F6 /* ChatView.swift in Sources */,
DAC002192B21630900A6C290 /* SwiftUIExtensions.swift in Sources */,
diff --git a/Hotline/Application.swift b/Hotline/Application.swift
index 2b25ba5..14717c2 100644
--- a/Hotline/Application.swift
+++ b/Hotline/Application.swift
@@ -3,8 +3,6 @@ import SwiftData
@main
struct Application: App {
- @State private var appState = HotlineState()
-
#if os(iOS)
private var model = Hotline(trackerClient: HotlineTrackerClient(), client: HotlineClient())
#endif
@@ -13,7 +11,6 @@ struct Application: App {
#if os(iOS)
WindowGroup {
TrackerView()
- .environment(appState)
.environment(model)
}
#elseif os(macOS)
diff --git a/Hotline/HotlineState.swift b/Hotline/HotlineState.swift
deleted file mode 100644
index 9ae4940..0000000
--- a/Hotline/HotlineState.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-import Foundation
-import SwiftUI
-
-@Observable
-class HotlineState {
- var agreementPresented = false
- var trackerPresented = true
-
- func presentTracker() {
- self.trackerPresented = true
- }
-
- func dismissTracker() {
- self.trackerPresented = false
- }
-
- func presentAgreement() {
- self.agreementPresented = true
- }
-
- func dismissAgreement() {
- self.agreementPresented = false
- }
-}
diff --git a/Hotline/iOS/NewsView.swift b/Hotline/iOS/NewsView.swift
index 92e8303..6d3ad45 100644
--- a/Hotline/iOS/NewsView.swift
+++ b/Hotline/iOS/NewsView.swift
@@ -247,6 +247,5 @@ struct NewsView: View {
#Preview {
MessageBoardView()
- .environment(HotlineState())
.environment(Hotline(trackerClient: HotlineTrackerClient(), client: HotlineClient()))
}