From ba8cd27b7020274245c8093e3169c27346c61980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 5 Aug 2023 21:27:52 +0800 Subject: [PATCH] Fixes --- .../Views/Dashboard/ActiveDashboardView.swift | 1 - .../Views/Dashboard/DashboardView.swift | 25 ++++++----- .../Views/Dashboard/OverviewView.swift | 45 ++++++++++--------- .../Views/Groups/GroupListView.swift | 2 +- .../Views/Profile/ProfileView.swift | 4 +- Library/Shared/FilePath.swift | 6 ++- 6 files changed, 46 insertions(+), 37 deletions(-) diff --git a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift index 3c0d6e8..736397c 100644 --- a/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift +++ b/ApplicationLibrary/Views/Dashboard/ActiveDashboardView.swift @@ -32,7 +32,6 @@ public struct ActiveDashboardView: View { } .pickerStyle(.segmented) #if os(iOS) - .padding([.leading, .trailing]) .navigationBarTitleDisplayMode(.inline) #endif diff --git a/ApplicationLibrary/Views/Dashboard/DashboardView.swift b/ApplicationLibrary/Views/Dashboard/DashboardView.swift index 74d1b86..d25ed2f 100644 --- a/ApplicationLibrary/Views/Dashboard/DashboardView.swift +++ b/ApplicationLibrary/Views/Dashboard/DashboardView.swift @@ -71,22 +71,23 @@ public struct DashboardView: View { @State private var alert: Alert? var body: some View { - ActiveDashboardView() - .environmentObject(profile) - EmptyView() - .alertBinding($alert) - .onChangeCompat(of: profile.status) { newValue in - if newValue == .disconnecting || newValue == .connected { - Task.detached { - if let serviceError = try? String(contentsOf: ExtensionProvider.errorFile) { - DispatchQueue.main.async { - alert = Alert(errorMessage: serviceError) - } - try? FileManager.default.removeItem(at: ExtensionProvider.errorFile) + VStack { + ActiveDashboardView() + .environmentObject(profile) + } + .alertBinding($alert) + .onChangeCompat(of: profile.status) { newValue in + if newValue == .disconnecting || newValue == .connected { + Task.detached { + if let serviceError = try? String(contentsOf: ExtensionProvider.errorFile) { + DispatchQueue.main.async { + alert = Alert(title: Text("Service Error"), message: Text(serviceError)) } + try? FileManager.default.removeItem(at: ExtensionProvider.errorFile) } } } + } } } } diff --git a/ApplicationLibrary/Views/Dashboard/OverviewView.swift b/ApplicationLibrary/Views/Dashboard/OverviewView.swift index dd8ca67..b377ae9 100644 --- a/ApplicationLibrary/Views/Dashboard/OverviewView.swift +++ b/ApplicationLibrary/Views/Dashboard/OverviewView.swift @@ -25,29 +25,34 @@ public struct OverviewView: View { if ApplicationLibrary.inPreview || profile.status.isConnected { ExtensionStatusView() } - FormView { - #if os(iOS) || os(tvOS) - StartStopButton() - Section("Profile") { - Picker(selection: $selectedProfileID) { - ForEach(profileList, id: \.id) { profile in - Text(profile.name).tag(profile.id) - } - } label: {} - .pickerStyle(.inline) - } - #elseif os(macOS) - Section("Profile") { - ForEach(profileList, id: \.id) { profile in - Picker(profile.name, selection: $selectedProfileID) { - Text("").tag(profile.id) - } + if profileList.isEmpty { + Text("Empty profiles") + } else { + FormView { + #if os(iOS) || os(tvOS) + StartStopButton() + Section("Profile") { + Picker(selection: $selectedProfileID) { + ForEach(profileList, id: \.id) { profile in + Text(profile.name).tag(profile.id) + } + } label: {} + .pickerStyle(.inline) } - .pickerStyle(.radioGroup) - } - #endif + #elseif os(macOS) + Section("Profile") { + ForEach(profileList, id: \.id) { profile in + Picker(profile.name, selection: $selectedProfileID) { + Text("").tag(profile.id) + } + } + .pickerStyle(.radioGroup) + } + #endif + } } } + .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) .alertBinding($alert) .onChangeCompat(of: selectedProfileID) { reasserting = true diff --git a/ApplicationLibrary/Views/Groups/GroupListView.swift b/ApplicationLibrary/Views/Groups/GroupListView.swift index 09937c8..de90c7e 100644 --- a/ApplicationLibrary/Views/Groups/GroupListView.swift +++ b/ApplicationLibrary/Views/Groups/GroupListView.swift @@ -27,7 +27,7 @@ public struct GroupListView: View { }.padding() } } else { - Text("Empty groups") + Text("Empty Groups") } } .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) diff --git a/ApplicationLibrary/Views/Profile/ProfileView.swift b/ApplicationLibrary/Views/Profile/ProfileView.swift index 1243ab8..91072cc 100644 --- a/ApplicationLibrary/Views/Profile/ProfileView.swift +++ b/ApplicationLibrary/Views/Profile/ProfileView.swift @@ -79,7 +79,7 @@ public struct ProfileView: View { } #endif if profileList.isEmpty { - Text("Empty Profiles") + Text("Empty profiles") } else { List { ForEach(profileList, id: \.mustID) { profile in @@ -99,7 +99,7 @@ public struct ProfileView: View { } #elseif os(macOS) if profileList.isEmpty { - Text("Empty Profiles") + Text("Empty profiles") } else { FormView { List { diff --git a/Library/Shared/FilePath.swift b/Library/Shared/FilePath.swift index 8ec982c..bfccef5 100644 --- a/Library/Shared/FilePath.swift +++ b/Library/Shared/FilePath.swift @@ -1,7 +1,11 @@ import Foundation public enum FilePath { - public static let packageName = "io.nekohasekai.sfa" + #if !NEXT + public static let packageName = "io.nekohasekai.sfa" + #else + public static let packageName = "io.nekohasekai.sfa.next" + #endif } public extension FilePath {