ashikk
/
jellyflood
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Review edits

This commit is contained in:
Ethan Pippin 2021-10-16 09:53:23 -06:00
parent 2d083eb8f5
commit cdec38be7a
5 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JellyfinPlayer tvOS/Views/ServerListView.swift
View File

@ -18,7 +18,7 @@ struct ServerListView: View {
@ViewBuilder
private var listView: some View {
ScrollView {
VStack {
LazyVStack {
ForEach(viewModel.servers, id: \.id) { server in
Button {
serverListRouter.route(to: \.userList, server)
@ -46,7 +46,7 @@ struct ServerListView: View {
Spacer()
}
}
.padding([.leading, .trailing], 100)
.padding(.horizontal, 100)
.contextMenu {
Button(role: .destructive) {
viewModel.remove(server: server)

4
JellyfinPlayer tvOS/Views/UserListView.swift
View File

@ -17,7 +17,7 @@ struct UserListView: View {
@ViewBuilder
private var listView: some View {
ScrollView {
VStack {
LazyVStack {
ForEach(viewModel.users, id: \.id) { user in
Button {
viewModel.login(user: user)
@ -33,7 +33,7 @@ struct UserListView: View {
}
}
}
.padding([.leading, .trailing], 100)
.padding(.horizontal, 100)
.contextMenu {
Button(role: .destructive) {
viewModel.remove(user: user)

7
JellyfinPlayer/Views/ServerListView.swift
View File

@ -15,10 +15,9 @@ struct ServerListView: View {
@EnvironmentObject var serverListRouter: ServerListCoordinator.Router
@ObservedObject var viewModel: ServerListViewModel
@ViewBuilder
private var listView: some View {
ScrollView {
VStack {
LazyVStack {
ForEach(viewModel.servers, id: \.id) { server in
Button {
serverListRouter.route(to: \.userList, server)
@ -64,7 +63,6 @@ struct ServerListView: View {
}
}
@ViewBuilder
private var noServerView: some View {
VStack {
Text("Connect to a Jellyfin server to get started")
@ -80,7 +78,7 @@ struct ServerListView: View {
.frame(maxWidth: 400, maxHeight: 50)
.frame(height: 50)
.cornerRadius(10)
.padding([.leading, .trailing], 30)
.padding(.horizontal, 30)
.padding([.top, .bottom], 20)
Text("Connect")
@ -114,7 +112,6 @@ struct ServerListView: View {
}
}
@ViewBuilder
private var leadingToolbarContent: some View {
Button {
serverListRouter.route(to: \.basicAppSettings)

6
JellyfinPlayer/Views/UserListView.swift
View File

@ -14,10 +14,9 @@ struct UserListView: View {
@EnvironmentObject var userListRouter: UserListCoordinator.Router
@ObservedObject var viewModel: UserListViewModel
@ViewBuilder
private var listView: some View {
ScrollView {
VStack {
LazyVStack {
ForEach(viewModel.users, id: \.id) { user in
Button {
viewModel.login(user: user)
@ -53,7 +52,6 @@ struct UserListView: View {
}
}
@ViewBuilder
private var noUserView: some View {
VStack {
Text("Sign in to get started")
@ -69,7 +67,7 @@ struct UserListView: View {
.frame(maxWidth: 400, maxHeight: 50)
.frame(height: 50)
.cornerRadius(10)
.padding([.leading, .trailing], 30)
.padding(.horizontal, 30)
.padding([.top, .bottom], 20)
Text("Sign in")

31
Shared/ViewModels/ViewModel.swift
View File

@ -70,37 +70,6 @@ class ViewModel: ObservableObject {
self.errorMessage = genericErrorMessage
LogManager.shared.log.error("Request failed: Generic error - \(error.localizedDescription)")
}
// if let errorResponse = error as? ErrorResponse {
//
// let networkError: NetworkError
//
// switch errorResponse {
// case .error(-1, _, _, _):
// networkError = .URLError(response: errorResponse, displayMessage: displayMessage, logConstructor: logConstructor)
// // Use the errorResponse description for debugging, rather than the user-facing friendly description which may not be implemented
// LogManager.shared.log.error("Request failed: URL request failed with error \(networkError.errorMessage.code): \(errorResponse.localizedDescription)")
// case .error(-2, _, _, _):
// networkError = .HTTPURLError(response: errorResponse, displayMessage: displayMessage, logConstructor: logConstructor)
// LogManager.shared.log.error("Request failed: HTTP URL request failed with description: \(errorResponse.localizedDescription)")
// default:
// networkError = .JellyfinError(response: errorResponse, displayMessage: displayMessage, logConstructor: logConstructor)
// // Able to use user-facing friendly description here since just HTTP status codes
// LogManager.shared.log.error("Request failed: \(networkError.errorMessage.code) - \(networkError.errorMessage.title): \(networkError.errorMessage.logConstructor.message)\n\(error.localizedDescription)")
// }
//
// self.errorMessage = networkError.errorMessage
//
// networkError.logMessage()
// } else {
// let generalErrorMessage = ErrorMessage(code: 0,
// title: "Error",
// displayMessage: error.localizedDescription,
// logConstructor: logConstructor)
//
// self.errorMessage = generalErrorMessage
// LogManager.shared.log.error("Request failed: General error - \(error.localizedDescription)")
// }
}
}
}