Add chat links in settings

2024-12-23 05:53:41 +00:00 · 2022-07-04 00:13:06 +02:00 · 2022-07-04 00:13:06 +02:00 · 415b0ff109
commit 415b0ff109
parent ffa7e09bee
6 changed files with 90 additions and 4 deletions
--- a/Shared/Assets.xcassets/Discord.imageset/Contents.json
+++ b/Shared/Assets.xcassets/Discord.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Discord-595b40b85ba036ed117dcf61 1.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Shared/Assets.xcassets/Discord.imageset/Discord-595b40b85ba036ed117dcf61
+++ b/Shared/Assets.xcassets/Discord.imageset/Discord-595b40b85ba036ed117dcf61
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50">
+    <path d="M41.626,10.768C37.644,7.567,31.347,7.025,31.08,7.003c-0.42-0.036-0.819,0.202-0.992,0.587 c-0.012,0.025-0.15,0.34-0.303,0.833c2.633,0.443,5.867,1.339,8.794,3.155c0.469,0.291,0.613,0.907,0.322,1.377 c-0.189,0.305-0.516,0.473-0.851,0.473c-0.18,0-0.362-0.048-0.526-0.15C32.494,10.158,26.209,10,25,10s-7.495,0.158-12.523,3.278 c-0.47,0.292-1.086,0.147-1.377-0.322c-0.292-0.47-0.147-1.086,0.322-1.377c2.927-1.815,6.16-2.712,8.794-3.155 c-0.154-0.493-0.292-0.808-0.303-0.833c-0.173-0.386-0.571-0.629-0.993-0.587c-0.266,0.021-6.563,0.563-10.598,3.809 C6.213,12.76,2,24.152,2,34c0,0.174,0.045,0.344,0.131,0.495c2.909,5.109,10.842,6.447,12.649,6.504C14.791,41,14.801,41,14.812,41 c0.319,0,0.62-0.152,0.809-0.411l1.829-2.513c-4.933-1.276-7.453-3.439-7.598-3.568c-0.414-0.365-0.453-0.997-0.087-1.411 c0.365-0.414,0.995-0.453,1.41-0.089C11.236,33.062,15.875,37,25,37c9.141,0,13.782-3.953,13.828-3.993 c0.414-0.359,1.045-0.323,1.409,0.094c0.364,0.414,0.325,1.043-0.088,1.407c-0.146,0.129-2.666,2.292-7.599,3.568l1.829,2.513 C34.568,40.848,34.869,41,35.188,41c0.011,0,0.021,0,0.031-0.001c1.809-0.057,9.741-1.395,12.649-6.504 C47.955,34.344,48,34.174,48,34C48,24.152,43.787,12.76,41.626,10.768z M18.5,30c-1.933,0-3.5-1.791-3.5-4c0-2.209,1.567-4,3.5-4 s3.5,1.791,3.5,4C22,28.209,20.433,30,18.5,30z M31.5,30c-1.933,0-3.5-1.791-3.5-4c0-2.209,1.567-4,3.5-4s3.5,1.791,3.5,4 C35,28.209,33.433,30,31.5,30z"/>
+</svg>
--- a/Shared/Assets.xcassets/Matrix.imageset/Contents.json
+++ b/Shared/Assets.xcassets/Matrix.imageset/Contents.json
@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Matrix (protocol) logo.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/Shared/Assets.xcassets/Matrix.imageset/Matrix
+++ b/Shared/Assets.xcassets/Matrix.imageset/Matrix
@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 27.9 32" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <title>Matrix (protocol) logo</title>
+ <g transform="translate(-.095 .005)" fill="#040404">
+  <path d="m27.1 31.2v-30.5h-2.19v-0.732h3.04v32h-3.04v-0.732z"/>
+  <path d="m8.23 10.4v1.54h0.044c0.385-0.564 0.893-1.03 1.49-1.37 0.58-0.323 1.25-0.485 1.99-0.485 0.72 0 1.38 0.14 1.97 0.42 0.595 0.279 1.05 0.771 1.36 1.48 0.338-0.5 0.796-0.941 1.38-1.32 0.58-0.383 1.27-0.574 2.06-0.574 0.602 0 1.16 0.074 1.67 0.22 0.514 0.148 0.954 0.383 1.32 0.707 0.366 0.323 0.653 0.746 0.859 1.27 0.205 0.522 0.308 1.15 0.308 1.89v7.63h-3.13v-6.46c0-0.383-0.015-0.743-0.044-1.08-0.0209-0.307-0.103-0.607-0.242-0.882-0.133-0.251-0.336-0.458-0.584-0.596-0.257-0.146-0.606-0.22-1.05-0.22-0.44 0-0.796 0.085-1.07 0.253-0.272 0.17-0.485 0.39-0.639 0.662-0.159 0.287-0.264 0.602-0.308 0.927-0.052 0.347-0.078 0.697-0.078 1.05v6.35h-3.13v-6.4c0-0.338-7e-3 -0.673-0.021-1-0.0114-0.314-0.0749-0.623-0.188-0.916-0.108-0.277-0.3-0.512-0.55-0.673-0.258-0.168-0.636-0.253-1.14-0.253-0.198 0.0083-0.394 0.042-0.584 0.1-0.258 0.0745-0.498 0.202-0.705 0.374-0.228 0.184-0.422 0.449-0.584 0.794-0.161 0.346-0.242 0.798-0.242 1.36v6.62h-3.13v-11.4z"/>
+  <path d="m0.936 0.732v30.5h2.19v0.732h-3.04v-32h3.03v0.732z"/>
+ </g>
+</svg>
--- a/Shared/Settings/Help.swift
+++ b/Shared/Settings/Help.swift
@ -3,7 +3,8 @@ import SwiftUI

 struct Help: View {
    static let wikiURL = URL(string: "https://github.com/yattee/yattee/wiki")!
-    static let matrixURL = URL(string: "https://tinyurl.com/yattee-matrix")!
+    static let matrixURL = URL(string: "https://tinyurl.com/matrix-yattee")!
+    static let discordURL = URL(string: "https://yattee.stream/discord")!
    static let issuesURL = URL(string: "https://github.com/yattee/yattee/issues")!
    static let milestonesURL = URL(string: "https://github.com/yattee/yattee/milestones")!
    static let donationsURL = URL(string: "https://github.com/yattee/yattee/wiki/Donations")!
@ -30,9 +31,11 @@ struct Help: View {
                    Section {
                        header("I want to ask a question")

-                        Text("Discussions take place in Matrix chat channel. It's a good spot for general questions.")
+                        Text("Discussions take place in Discord and Matrix. It's a good spot for general questions.")
                            .padding(.bottom, 8)

+                        helpItemLink("Discord Server", url: Self.discordURL, systemImage: "message")
+                            .padding(.bottom, 8)
                        helpItemLink("Matrix Channel", url: Self.matrixURL, systemImage: "message")
                            .padding(.bottom, 8)
                    }
--- a/Shared/Settings/SettingsView.swift
+++ b/Shared/Settings/SettingsView.swift
@ -3,6 +3,9 @@ import Foundation
 import SwiftUI

 struct SettingsView: View {
+    static let matrixURL = URL(string: "https://tinyurl.com/matrix-yattee")!
+    static let discordURL = URL(string: "https://yattee.stream/discord")!
+
    #if os(macOS)
        private enum Tabs: Hashable {
            case locations, browsing, player, history, sponsorBlock, advanced, help
@ -158,13 +161,38 @@ struct SettingsView: View {
                    }
                }

-                Section(footer: versionString) {
+                Section {
                    NavigationLink {
                        Help()
                    } label: {
                        Label("Help", systemImage: "questionmark.circle")
                    }
                }
+
+                #if !os(tvOS)
+                    Section(header: Text("Contact"), footer: versionString) {
+                        Link(destination: Self.discordURL) {
+                            HStack {
+                                Image("Discord")
+                                    .resizable()
+                                    .renderingMode(.template)
+                                    .frame(maxWidth: 30, maxHeight: 30)
+
+                                Text("Discord Server")
+                            }
+                        }
+
+                        Link(destination: Self.matrixURL) {
+                            HStack {
+                                Image("Matrix")
+                                    .resizable()
+                                    .renderingMode(.template)
+                                    .frame(maxWidth: 30, maxHeight: 30)
+                                Text("Matrix Chat")
+                            }
+                        }
+                    }
+                #endif
            }
            .navigationTitle("Settings")
            .toolbar {
@ -200,7 +228,7 @@ struct SettingsView: View {
            case .advanced:
                return 300
            case .help:
-                return 570
+                return 600
            }
        }
    #endif