From ce0be87c7f39e9763d835a685cb65eb38c7e68c3 Mon Sep 17 00:00:00 2001 From: Shav Kinderlehrer Date: Wed, 21 Feb 2024 12:20:24 -0500 Subject: Cleanup + change SignInView to be a sheet --- Jel/Views/SignIn/AddServerView.swift | 12 ++++++------ Jel/Views/SignIn/SignInToServerView.swift | 2 +- Jel/Views/SignIn/SignInView.swift | 9 ++++----- 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'Jel/Views/SignIn') diff --git a/Jel/Views/SignIn/AddServerView.swift b/Jel/Views/SignIn/AddServerView.swift index 40c2312..01d4a49 100644 --- a/Jel/Views/SignIn/AddServerView.swift +++ b/Jel/Views/SignIn/AddServerView.swift @@ -12,7 +12,7 @@ struct AddServerView: View { @ObservedObject var authState: AuthStateController = AuthStateController.shared @Binding var serverUrlIsValid: Bool - @State var serverUrlString: String = "http://" + @State var serverUrlString: String = "" @State var urlHasError: Bool = false @State var currentErrorMessage: String = "" @State var isLoading: Bool = false @@ -25,7 +25,7 @@ struct AddServerView: View { .font(.title) HStack { TextField(text: $serverUrlString) { - Text("http://jellyfin.example.com") + Text(verbatim: "https://jellyfin.example.com") } .keyboardType(.URL) .textContentType(.URL) @@ -102,7 +102,7 @@ struct AddServerView: View { } -#Preview { - AddServerView(serverUrlIsValid: .constant(false)) - -} +//#Preview { +// AddServerView(serverUrlIsValid: .constant(false)) +// +//} diff --git a/Jel/Views/SignIn/SignInToServerView.swift b/Jel/Views/SignIn/SignInToServerView.swift index 259e54d..18907a5 100644 --- a/Jel/Views/SignIn/SignInToServerView.swift +++ b/Jel/Views/SignIn/SignInToServerView.swift @@ -10,7 +10,7 @@ import SwiftUI struct SignInToServerView: View { @EnvironmentObject var jellyfinClient: JellyfinClientController - @StateObject var authState: AuthStateController = AuthStateController.shared + @ObservedObject var authState: AuthStateController = AuthStateController.shared @State var username: String = "" @State var password: String = "" diff --git a/Jel/Views/SignIn/SignInView.swift b/Jel/Views/SignIn/SignInView.swift index 729b34b..f3e2675 100644 --- a/Jel/Views/SignIn/SignInView.swift +++ b/Jel/Views/SignIn/SignInView.swift @@ -11,9 +11,8 @@ import PulseUI struct SignInView: View { @EnvironmentObject var jellyfinClient: JellyfinClientController - @StateObject var authState: AuthStateController = AuthStateController.shared + @ObservedObject var authState: AuthStateController = AuthStateController.shared @State var serverUrlIsValid: Bool = false - @State var showingConsoleSheet: Bool = false var body: some View { NavigationStack { @@ -40,6 +39,6 @@ struct SignInView: View { } } -#Preview { - SignInView() -} +//#Preview { +// SignInView() +//} -- cgit v1.2.3