Use SF Symbols Icons

TURX · TURX · commit 425c8638cc6b · 2024-12-25T00:11:33.000-06:00
diff --git a/KDE Connect/KDE Connect/Views/Devices/Mac/DeviceItemView.swift b/KDE Connect/KDE Connect/Views/Devices/Mac/DeviceItemView.swift
@@ -14,17 +14,17 @@ struct DeviceItemView: View {
     let deviceId: String
     let parent: DevicesView?
     @Binding var deviceName: String
-    let emoji: String
+    let icon: Image
     let connState: DevicesView.ConnectionState
     let mockBatteryLevel: Int?
     @State var backgroundColor: Color
     @Environment(\.colorScheme) var colorScheme
     
-    init(deviceId: String, parent: DevicesView? = nil, deviceName: Binding<String>, emoji: String, connState: DevicesView.ConnectionState, mockBatteryLevel: Int? = nil) {
+    init(deviceId: String, parent: DevicesView? = nil, deviceName: Binding<String>, icon: Image, connState: DevicesView.ConnectionState, mockBatteryLevel: Int? = nil) {
         self.deviceId = deviceId
         self.parent = parent
         self._deviceName = deviceName
-        self.emoji = emoji
+        self.icon = icon
         self.connState = connState
         self.mockBatteryLevel = mockBatteryLevel
         switch (connState) {
@@ -107,7 +107,7 @@ struct DeviceItemView: View {
                         .font(.system(.footnote, design: .rounded).weight(.light))
                         .foregroundColor(.black)
                 }
-                Text(emoji)
+                icon
                     .font(.system(size: 32))
                     .shadow(radius: 1)
             }
@@ -212,7 +212,7 @@ struct DeviceItemView: View {
 
 struct DeviceIcon_Previews: PreviewProvider {
     static var previews: some View {
-        DeviceItemView(deviceId: "0", parent: nil, deviceName: .constant("TURX's MacBook Pro"), emoji: "\u{1F5A5}", connState: .local)
+        DeviceItemView(deviceId: "0", parent: nil, deviceName: .constant("TURX's MacBook Pro"), icon: Image(systemName: "laptopcomputer"), connState: .local)
     }
 }
 
diff --git a/KDE Connect/KDE Connect/Views/Devices/Mac/MacDevicesView.swift b/KDE Connect/KDE Connect/Views/Devices/Mac/MacDevicesView.swift
@@ -49,22 +49,22 @@ struct DevicesView: View {
         self.genMode = genMode
     }
     
-    static func getEmojiFromDeviceType(_ deviceType: DeviceType) -> String {
+    static func getIconFromDeviceType(_ deviceType: DeviceType) -> Image {
         switch (deviceType) {
         case .desktop:
-            return "\u{1F5A5}"
+            return Image(systemName: "desktopcomputer")
         case .laptop:
-            return "\u{1F4BB}"
+            return Image(systemName: "laptopcomputer")
         case .phone:
-            return "\u{1F4F1}"
+            return Image(systemName: "smartphone")
         case .tablet:
-            return "\u{1F3AC}"
+            return Image(systemName: "ipad")
         case .appletv:
-            return "\u{1F4FA}"
+            return Image(systemName: "tv")
         case .unknown:
-            return "\u{2754}"
+            return Image(systemName: "questionmark")
         @unknown default:
-            return "\u{2753}"
+            return Image(systemName: "questionmark")
         }
     }
     
@@ -74,17 +74,17 @@ struct DevicesView: View {
             return []
         case .demo:
             return [
-                DeviceItemView(deviceId: "1", parent: self, deviceName: .constant("My iPhone"), emoji: DevicesView.getEmojiFromDeviceType(.phone), connState: .connected, mockBatteryLevel: 67),
-                DeviceItemView(deviceId: "2", parent: self, deviceName: .constant("My iMac"), emoji: DevicesView.getEmojiFromDeviceType(.desktop), connState: .connected),
-                DeviceItemView(deviceId: "3", parent: self, deviceName: .constant("My MacBook"), emoji: DevicesView.getEmojiFromDeviceType(.laptop), connState: .saved),
-                DeviceItemView(deviceId: "4", parent: self, deviceName: .constant("My iPad"), emoji: DevicesView.getEmojiFromDeviceType(.tablet), connState: .visible),
-                DeviceItemView(deviceId: "5", parent:self, deviceName: .constant("My Apple TV"), emoji: DevicesView.getEmojiFromDeviceType(.appletv), connState: .visible),
-                DeviceItemView(deviceId: "6", deviceName: .constant("Unknown device"), emoji: DevicesView.getEmojiFromDeviceType(.unknown), connState: .visible)
+                DeviceItemView(deviceId: "1", parent: self, deviceName: .constant("My iPhone"), icon: DevicesView.getIconFromDeviceType(.phone), connState: .connected, mockBatteryLevel: 67),
+                DeviceItemView(deviceId: "2", parent: self, deviceName: .constant("My iMac"), icon: DevicesView.getIconFromDeviceType(.desktop), connState: .connected),
+                DeviceItemView(deviceId: "3", parent: self, deviceName: .constant("My MacBook"), icon: DevicesView.getIconFromDeviceType(.laptop), connState: .saved),
+                DeviceItemView(deviceId: "4", parent: self, deviceName: .constant("My iPad"), icon: DevicesView.getIconFromDeviceType(.tablet), connState: .visible),
+                DeviceItemView(deviceId: "5", parent:self, deviceName: .constant("My Apple TV"), icon: DevicesView.getIconFromDeviceType(.appletv), connState: .visible),
+                DeviceItemView(deviceId: "6", deviceName: .constant("Unknown device"), icon: DevicesView.getIconFromDeviceType(.unknown), connState: .visible)
             ]
         case .hundred:
             var deviceIcons = [DeviceItemView]()
             for demoDeviceId in 1...100 {
-                deviceIcons.append(DeviceItemView(deviceId: String(demoDeviceId), parent: self, deviceName: .constant(String(demoDeviceId)), emoji: "\u{1F4F1}", connState: .saved))
+                deviceIcons.append(DeviceItemView(deviceId: String(demoDeviceId), parent: self, deviceName: .constant(String(demoDeviceId)), icon: DevicesView.getIconFromDeviceType(.phone), connState: .saved))
             }
             return deviceIcons
         case .normal:
@@ -94,7 +94,7 @@ struct DevicesView: View {
                     deviceId: key,
                     parent: self,
                     deviceName: .constant(viewModel.connectedDevices[key] ?? "Unknown device"),
-                    emoji: DevicesView.getEmojiFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
+                    icon: DevicesView.getIconFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
                     connState: .connected
                 ))
             }
@@ -103,7 +103,7 @@ struct DevicesView: View {
                     deviceId: key,
                     parent: self,
                     deviceName: .constant(viewModel.savedDevices[key] ?? "Unknown device"),
-                    emoji: DevicesView.getEmojiFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
+                    icon: DevicesView.getIconFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
                     connState: .saved
                 ))
             }
@@ -112,7 +112,7 @@ struct DevicesView: View {
                     deviceId: key,
                     parent: self,
                     deviceName: .constant(viewModel.visibleDevices[key] ?? "Unknown device"),
-                    emoji: DevicesView.getEmojiFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
+                    icon: DevicesView.getIconFromDeviceType(backgroundService._devices[key]?._deviceInfo.type ?? .unknown),
                     connState: .visible
                 ))
             }
diff --git a/KDE Connect/KDE Connect/Views/Top Level/Mac/HelpView.swift b/KDE Connect/KDE Connect/Views/Top Level/Mac/HelpView.swift
@@ -54,7 +54,7 @@ struct HelpView: View {
                 HStack {
                     VStack(spacing: 5) {
                         Text("Help").font(.title)
-                        Text(helpText()).fixedSize()
+                        Text(helpText()).fixedSize().frame(maxWidth: .infinity)
                     }
                     Spacer()
                 }
diff --git a/KDE Connect/KDE Connect/Views/Top Level/Mac/MainView.swift b/KDE Connect/KDE Connect/Views/Top Level/Mac/MainView.swift
@@ -49,7 +49,7 @@ struct MainView: View {
                 HStack {
                     Spacer().frame(maxWidth: .infinity)
                     HStack {
-                        DeviceItemView(deviceId: "0", parent: nil, deviceName: $selfData.deviceName, emoji: DevicesView.getEmojiFromDeviceType(DeviceType.current), connState: .local)
+                        DeviceItemView(deviceId: "0", parent: nil, deviceName: $selfData.deviceName, icon: DevicesView.getIconFromDeviceType(DeviceType.current), connState: .local)
                             .padding(.all)
                     }.frame(maxWidth: .infinity)
                     if !self.showingHelpWindow {
diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# The Official Repository of KDE Connect iOS
+# The Official Repository of KDE Connect iOS/macOS
 
 **TL;DR: [Download from the App Store](https://apps.apple.com/app/kde-connect/id1580245991) on an iOS >= 14 or macOS >= 13 device!**
 
 ---
 
-This project is the iOS version of the group of applications called KDE Connect, which uses the LAN network to integrate devices together. For information on KDE Connect, check out:
+This project is the iOS/macOS version of the group of applications called KDE Connect, which uses the LAN network to integrate devices together. For information on KDE Connect, check out:
 
 - [The KDE Community Wiki](https://community.kde.org/KDEConnect)
 - [The KDE UserBase Wiki](https://userbase.kde.org/KDEConnect)

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ struct HelpView: View {`
`54`	`54`	`HStack {`
`55`	`55`	`VStack(spacing: 5) {`
`56`	`56`	`Text("Help").font(.title)`
`57`		`- Text(helpText()).fixedSize()`
	`57`	`+ Text(helpText()).fixedSize().frame(maxWidth: .infinity)`
`58`	`58`	`}`
`59`	`59`	`Spacer()`
`60`	`60`	`}`