diff --git a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate index 77fa72a..a905929 100644 Binary files a/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate and b/Sora.xcodeproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Sora/SoraApp.swift b/Sora/SoraApp.swift index 71f156b..bc0e9e6 100644 --- a/Sora/SoraApp.swift +++ b/Sora/SoraApp.swift @@ -46,4 +46,3 @@ struct SoraApp: App { } } } - diff --git a/Sora/Utils/CustomPlayer/Components/MusicProgressSlider.swift b/Sora/Utils/CustomPlayer/Components/MusicProgressSlider.swift index 983996d..8bbb950 100644 --- a/Sora/Utils/CustomPlayer/Components/MusicProgressSlider.swift +++ b/Sora/Utils/CustomPlayer/Components/MusicProgressSlider.swift @@ -55,16 +55,16 @@ struct MusicProgressSlider: View { .frame(width: bounds.size.width, height: bounds.size.height, alignment: .center) .contentShape(Rectangle()) .gesture(DragGesture(minimumDistance: 0, coordinateSpace: .local) - .updating($isActive) { _, state, _ in - state = true - } - .onChanged { gesture in - localTempProgress = T(gesture.translation.width / bounds.size.width) - value = max(min(getPrgValue(), inRange.upperBound), inRange.lowerBound) - }.onEnded { _ in - localRealProgress = max(min(localRealProgress + localTempProgress, 1), 0) - localTempProgress = 0 - }) + .updating($isActive) { _, state, _ in + state = true + } + .onChanged { gesture in + localTempProgress = T(gesture.translation.width / bounds.size.width) + value = max(min(getPrgValue(), inRange.upperBound), inRange.lowerBound) + }.onEnded { _ in + localRealProgress = max(min(localRealProgress + localTempProgress, 1), 0) + localTempProgress = 0 + }) .onChange(of: isActive) { newValue in value = max(min(getPrgValue(), inRange.upperBound), inRange.lowerBound) onEditingChanged(newValue) diff --git a/Sora/Utils/Player/NormalPlayer.swift b/Sora/Utils/Player/NormalPlayer.swift index 8c58aae..2c92496 100644 --- a/Sora/Utils/Player/NormalPlayer.swift +++ b/Sora/Utils/Player/NormalPlayer.swift @@ -75,4 +75,3 @@ class NormalPlayer: AVPlayerViewController { } } } - diff --git a/Sora/Views/SearchViews/SearchResultsView.swift b/Sora/Views/SearchViews/SearchResultsView.swift index d28c626..b66fd33 100644 --- a/Sora/Views/SearchViews/SearchResultsView.swift +++ b/Sora/Views/SearchViews/SearchResultsView.swift @@ -6,8 +6,8 @@ // import SwiftUI -import Kingfisher import SwiftSoup +import Kingfisher struct SearchResultsView: View { let module: ModuleStruct? diff --git a/Sora/Views/SearchViews/SearchView.swift b/Sora/Views/SearchViews/SearchView.swift index 0a32725..441e655 100644 --- a/Sora/Views/SearchViews/SearchView.swift +++ b/Sora/Views/SearchViews/SearchView.swift @@ -105,7 +105,7 @@ struct SearchView: View { .alert(isPresented: $showAlert) { Alert( title: Text("No module selected"), - message: Text("Please select a module before searching or add it in settings."), + message: Text("Please select a module before searching."), dismissButton: .default(Text("OK")) ) } diff --git a/Sora/Views/SettingsViews/SettingView.swift b/Sora/Views/SettingsViews/SettingView.swift index c1d8a41..2c62379 100644 --- a/Sora/Views/SettingsViews/SettingView.swift +++ b/Sora/Views/SettingsViews/SettingView.swift @@ -19,7 +19,7 @@ struct SettingsView: View { @State private var selectedModule: ModuleStruct? @StateObject private var libraryManager = LibraryManager.shared @StateObject private var modulesManager = ModulesManager() - + var body: some View { NavigationView { Form { diff --git a/Sora/Views/SettingsViews/SubPages/SettingsLogsView.swift b/Sora/Views/SettingsViews/SubPages/SettingsLogsView.swift index fc961bc..07bbeae 100644 --- a/Sora/Views/SettingsViews/SubPages/SettingsLogsView.swift +++ b/Sora/Views/SettingsViews/SubPages/SettingsLogsView.swift @@ -63,7 +63,7 @@ class Logger { let dateFormatter = DateFormatter() dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" return logs.map { "[\(dateFormatter.string(from: $0.timestamp))] \($0.message)" } - .joined(separator: "\n---\n") + .joined(separator: "\n---\n") } func clearLogs() {