Merge remote-tracking branch 'upstream/main'

1 files changed, 0 insertions, 183 deletions

diff --git a/Hotline/macOS/SettingsView.swift b/Hotline/macOS/SettingsView.swift
deleted file mode 100644
index c67ba85..0000000
--- a/Hotline/macOS/SettingsView.swift
+++ /dev/null
@@ -1,183 +0,0 @@
-import SwiftUI
-
-struct GeneralSettingsView: View {
-  @State private var username: String = ""
-  @State private var usernameChanged: Bool = false
-
-  let saveTimer = Timer.publish(every: 5, on: .main, in: .common).autoconnect()
-
-  var body: some View {
-    @Bindable var preferences = Prefs.shared
-
-    Form {
-      TextField("Your Name", text: $username, prompt: Text("guest"))
-      Toggle("Show Join/Leave in Chat", isOn: $preferences.showJoinLeaveMessages)
-      Toggle("Refuse private messages", isOn: $preferences.refusePrivateMessages)
-      Toggle("Refuse private chat", isOn: $preferences.refusePrivateChat)
-      Toggle("Automatic Response", isOn: $preferences.enableAutomaticMessage)
-      if preferences.enableAutomaticMessage {
-        TextField("", text: $preferences.automaticMessage, prompt: Text("Write a response message"))
-          .lineLimit(2)
-          .multilineTextAlignment(.leading)
-          .frame(maxWidth: .infinity)
-          .onSubmit(of: .text) {
-            preferences.username = self.username
-          }
-      }
-    }
-    .padding()
-    .frame(width: 392)
-    .onAppear {
-      self.username = preferences.username
-      self.usernameChanged = false
-    }
-    .onDisappear {
-      preferences.username = self.username
-      self.usernameChanged = false
-    }
-    .onChange(of: username) { oldValue, newValue in
-      self.usernameChanged = true
-    }
-    .onReceive(saveTimer) { _ in
-      if self.usernameChanged {
-        self.usernameChanged = false
-        preferences.username = self.username
-      }
-    }
-  }
-}
-
-struct IconSettingsView: View {
-  @State private var hoveredUserIconID: Int = -1
-
-  var body: some View {
-    @Bindable var preferences = Prefs.shared
-
-    Form {
-      ScrollViewReader { scrollProxy in
-        ScrollView {
-          LazyVGrid(
-            columns: [
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-              GridItem(.fixed(4 + 32 + 4)),
-            ], spacing: 0
-          ) {
-            ForEach(Hotline.classicIconSet, id: \.self) { iconID in
-              HStack {
-                Image("Classic/\(iconID)")
-                  .resizable()
-                  .interpolation(.none)
-                  .scaledToFit()
-                  .frame(width: 32, height: 16)
-                  .help("Icon \(String(iconID))")
-              }
-              .tag(iconID)
-              .frame(width: 32, height: 32)
-              .padding(4)
-              .background(
-                iconID == preferences.userIconID
-                  ? Color.accentColor
-                  : (iconID == hoveredUserIconID
-                    ? Color.accentColor.opacity(0.1) : Color(nsColor: .textBackgroundColor))
-              )
-              .clipShape(RoundedRectangle(cornerRadius: 5))
-              .onTapGesture {
-                preferences.userIconID = iconID
-              }
-              .onHover { hovered in
-                if hovered {
-                  self.hoveredUserIconID = iconID
-                }
-              }
-            }
-          }
-          .padding()
-        }
-        .background(Color(nsColor: .textBackgroundColor))
-        .clipShape(RoundedRectangle(cornerRadius: 6))
-        .overlay(
-          RoundedRectangle(cornerRadius: 6).stroke(Color(nsColor: .separatorColor), lineWidth: 1)
-        )
-        .onAppear {
-          scrollProxy.scrollTo(preferences.userIconID, anchor: .center)
-        }
-        .frame(height: 355)
-      }
-    }
-    .padding()
-  }
-}
-
-struct SoundSettingsView: View {
-  var body: some View {
-    @Bindable var preferences = Prefs.shared
-
-    Form {
-      Toggle("Enable Sounds", isOn: $preferences.playSounds)
-        .controlSize(.large)
-
-      Section("Sounds") {
-        Toggle("Chat", isOn: $preferences.playChatSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("File Transfers", isOn: $preferences.playFileTransferCompleteSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Private Message", isOn: $preferences.playPrivateMessageSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Join", isOn: $preferences.playJoinSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Leave", isOn: $preferences.playLeaveSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Logged in", isOn: $preferences.playLoggedInSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Error", isOn: $preferences.playErrorSound)
-          .disabled(!preferences.playSounds)
-
-        Toggle("Chat Invitation", isOn: $preferences.playChatInvitationSound)
-          .disabled(!preferences.playSounds)
-      }
-    }
-    .formStyle(.grouped)
-    .frame(width: 392, height: 433)
-  }
-}
-
-struct SettingsView: View {
-  private enum Tabs: Hashable {
-    case general, icon
-  }
-
-  var body: some View {
-    TabView {
-      GeneralSettingsView()
-        .tabItem {
-          Label("General", systemImage: "person.text.rectangle")
-        }
-        .tag(Tabs.general)
-      IconSettingsView()
-        .tabItem {
-          Label("Icon", systemImage: "person")
-        }
-        .tag(Tabs.icon)
-      SoundSettingsView()
-        .tabItem {
-          Label("Sound", systemImage: "speaker.wave.3")
-        }
-        .tag(Tabs.icon)
-    }
-  }
-}
-
-#Preview {
-  SettingsView()
-}