fix: welcome dialog links

DearVa · DearVa · commit 6aaeee8972e8 · 2025-08-02T01:42:07.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -247,7 +247,7 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 
-[*.{axaml,html,xaml,xml}]
+[*.{axaml,html,xaml,xml,yml}]
 indent_style = space
 indent_size = 2
 tab_width = 2
diff --git a/Settings.XamlStyler b/Settings.XamlStyler
@@ -36,7 +36,7 @@
     "ReorderCanvasChildren": false,
     "ReorderSetters": 0,
     "FormatMarkupExtension": true,
-    "NoNewLineMarkupExtensions": "x:Bind, Binding, ReflectionBinding, CompiledBinding, d:DesignInstance, ex:ServiceLocator, TemplateBinding, OnPlatform, LucideIcon",
+    "NoNewLineMarkupExtensions": "x:Bind, Binding, ReflectionBinding, CompiledBinding, d:DesignInstance, I18N, ServiceLocator, TemplateBinding, OnPlatform, LucideIcon",
     "ThicknessSeparator": 2,
     "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
     "FormatOnSave": true,
diff --git a/src/Everywhere/I18N/Strings.de.resx b/src/Everywhere/I18N/Strings.de.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.es.resx b/src/Everywhere/I18N/Strings.es.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.fr.resx b/src/Everywhere/I18N/Strings.fr.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.it.resx b/src/Everywhere/I18N/Strings.it.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.ja.resx b/src/Everywhere/I18N/Strings.ja.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.ko.resx b/src/Everywhere/I18N/Strings.ko.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.resx b/src/Everywhere/I18N/Strings.resx
@@ -517,4 +517,13 @@ Tip: You can reopen this message by clicking “About - Welcome Page”.</value>
     <data name="WelcomeView_FeatureRequest" xml:space="preserve">
         <value>Feature Request</value>
     </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_Discord" xml:space="preserve">
+        <value>Discord</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.ru.resx b/src/Everywhere/I18N/Strings.ru.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.zh-hans.resx b/src/Everywhere/I18N/Strings.zh-hans.resx
@@ -498,4 +498,13 @@
     <data name="WelcomeView_FeatureRequest" xml:space="preserve">
         <value>功能请求</value>
     </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report-zh.yml</value>
+    </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request-zh.yml</value>
+    </data>
+    <data name="WelcomeView_Discord" xml:space="preserve">
+        <value>Discord</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.zh-hant-hk.resx b/src/Everywhere/I18N/Strings.zh-hant-hk.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/I18N/Strings.zh-hant.resx b/src/Everywhere/I18N/Strings.zh-hant.resx
@@ -44,4 +44,10 @@
     <data name="SettingsSelectionItem_Common_Language_zh-hant-hk" xml:space="preserve">
         <value>中文 (繁體 香港特別行政區)</value>
     </data>
+    <data name="WelcomeView_FeatureRequestUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=feature-request.yml</value>
+    </data>
+    <data name="WelcomeView_ReportBugUri" xml:space="preserve">
+        <value>https://github.com/DearVa/Everywhere/issues/new?template=bug-report.yml</value>
+    </data>
 </root>
diff --git a/src/Everywhere/MarkupExtensions/I18NExtension.cs b/src/Everywhere/MarkupExtensions/I18NExtension.cs
@@ -1,5 +1,7 @@
 ﻿using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using Avalonia.Data;
+using Avalonia.Data.Converters;
 using Avalonia.Markup.Xaml;
 using Avalonia.Metadata;
 using Microsoft.Extensions.DependencyInjection;
@@ -13,6 +15,12 @@ public class I18NExtension : MarkupExtension
     [Content, AssignBinding]
     public object[] Arguments { get; set; } = [];
 
+    public IValueConverter? Converter { get; set; }
+
+    public object? ConverterParameter { get; set; }
+
+    public CultureInfo? ConverterCulture { get; set; }
+
     public I18NExtension() { }
 
     [SetsRequiredMembers]
@@ -29,7 +37,14 @@ public override object ProvideValue(IServiceProvider serviceProvider)
             }).ToArray()) :
             new DynamicResourceKey(Key);
         return target?.TargetProperty is AvaloniaProperty ?
-            dynamicResourceKey.ToBinding() :
+            new Binding
+            {
+                Path = "Self^",
+                Source = dynamicResourceKey,
+                Converter = Converter,
+                ConverterParameter = ConverterParameter,
+                ConverterCulture = ConverterCulture,
+            } :
             dynamicResourceKey.ToString() ?? string.Empty; // Only AvaloniaProperty can resolve binding, otherwise return resolved string
     }
 }
diff --git a/src/Everywhere/ValueConverters/CommonConverters.cs b/src/Everywhere/ValueConverters/CommonConverters.cs
@@ -7,4 +7,9 @@ public static class CommonConverters
     public static IValueConverter TypeEquals { get; } = new ParameterizedFuncValueConverter<object?, bool>(
         convert: (x, parameter) => x?.GetType() == parameter as Type
     );
+
+    public static IValueConverter StringToUri { get; } = new BidirectionalFuncValueConverter<string?, Uri?>(
+        convert: x => x == null ? null : new Uri(x, UriKind.RelativeOrAbsolute),
+        convertBack: x => x?.ToString()
+    );
 }
diff --git a/src/Everywhere/Views/WelcomeView.axaml b/src/Everywhere/Views/WelcomeView.axaml
@@ -1,8 +1,9 @@
 ﻿<UserControl
   x:Class="Everywhere.Views.WelcomeView" xmlns="https://github.com/avaloniaui"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" d:DesignHeight="450"
-  d:DesignWidth="800" mc:Ignorable="d">
+  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vc="clr-namespace:Everywhere.ValueConverters"
+  d:DesignHeight="450" d:DesignWidth="800"
+  mc:Ignorable="d">
   <StackPanel
     Margin="32,20" HorizontalAlignment="Center"
     VerticalAlignment="Center" Spacing="16">
@@ -37,12 +38,17 @@
       <HyperlinkButton
         VerticalAlignment="Center"
         Content="{I18N {x:Static LocaleKey.WelcomeView_ReportBug}}"
-        NavigateUri="https://github.com/DearVa/Everywhere/issues/new?labels=bug&amp;template=bug-report.md"
+        NavigateUri="{I18N {x:Static LocaleKey.WelcomeView_ReportBugUri}, Converter={x:Static vc:CommonConverters.StringToUri}}"
         TextElement.Foreground="{DynamicResource InfoColor}"/>
       <HyperlinkButton
         VerticalAlignment="Center"
         Content="{I18N {x:Static LocaleKey.WelcomeView_FeatureRequest}}"
-        NavigateUri="https://github.com/DearVa/Everywhere/issues/new?labels=enhancement&amp;template=enhancement.md"
+        NavigateUri="{I18N {x:Static LocaleKey.WelcomeView_FeatureRequestUri}, Converter={x:Static vc:CommonConverters.StringToUri}}"
+        TextElement.Foreground="{DynamicResource InfoColor}"/>
+      <HyperlinkButton
+        VerticalAlignment="Center"
+        Content="{I18N {x:Static LocaleKey.WelcomeView_Discord}}"
+        NavigateUri="https://discord.gg/5fyg6nE3yn"
         TextElement.Foreground="{DynamicResource InfoColor}"/>
       <HyperlinkButton
         VerticalAlignment="Center"
