Skip to content

Commit af10785

Browse files
SineVector241SineVector241
authored
Merge pull request #194 from AvionBlock/dev
v.1.3.1
2 parents 17eba87 + acf03ea commit af10785

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+686
-259
lines changed

‎Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Version>1.3.1</Version>
4+
<AndroidVersion>13</AndroidVersion>
5+
</PropertyGroup>
6+
</Project>

‎Directory.Packages.props‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
<Project>
2-
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3-
<PropertyGroup>
4-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
<AvaloniaVersion>11.3.9</AvaloniaVersion>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
<!-- Avalonia packages -->
9-
<!-- Important: keep version in sync! -->
10-
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)"/>
11-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
12-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)"/>
13-
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>none</IncludeAssets>
16-
</PackageVersion>
17-
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
18-
<PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)"/>
19-
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
20-
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
21-
<PackageVersion Include="Fleck" Version="1.2.0"/>
22-
<PackageVersion Include="LiteNetLib" Version="1.3.5"/>
23-
<PackageVersion Include="Message.Avalonia" Version="1.1.0"/>
24-
<PackageVersion Include="SharpHook" Version="7.1.0"/>
25-
<PackageVersion Include="SpeexDSPSharp" Version="1.2.2"/>
26-
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0"/>
27-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
28-
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70"/>
29-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1"/>
30-
<PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.120"/>
31-
<PackageVersion Include="NAudio.WinForms" Version="2.2.1"/>
32-
<PackageVersion Include="NAudio.WinMM" Version="2.2.1"/>
33-
<PackageVersion Include="OpusSharp" Version="1.6.0"/>
34-
<PackageVersion Include="System.Text.Json" Version="10.0.1"/>
35-
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0"/>
36-
<PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4"/>
37-
<PackageVersion Include="Spectre.Console" Version="0.54.0"/>
38-
<PackageVersion Include="System.CommandLine" Version="2.0.1"/>
39-
</ItemGroup>
2+
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
<AvaloniaVersion>11.3.9</AvaloniaVersion>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<!-- Avalonia packages -->
9+
<!-- Important: keep version in sync! -->
10+
<PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
11+
<PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
12+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
13+
<PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>none</IncludeAssets>
16+
</PackageVersion>
17+
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
18+
<PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
19+
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
20+
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
21+
<PackageVersion Include="Fleck" Version="1.2.0" />
22+
<PackageVersion Include="LiteNetLib" Version="1.3.5" />
23+
<PackageVersion Include="Message.Avalonia" Version="1.1.0" />
24+
<PackageVersion Include="SharpHook" Version="7.1.1" />
25+
<PackageVersion Include="SpeexDSPSharp" Version="1.2.2" />
26+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
27+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
28+
<PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
30+
<PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.120" />
31+
<PackageVersion Include="NAudio.WinForms" Version="2.2.1" />
32+
<PackageVersion Include="NAudio.WinMM" Version="2.2.1" />
33+
<PackageVersion Include="OpusSharp" Version="1.6.1" />
34+
<PackageVersion Include="System.Text.Json" Version="10.0.2" />
35+
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
36+
<PackageVersion Include="OpenTK.Audio.OpenAL" Version="4.9.4" />
37+
<PackageVersion Include="Spectre.Console" Version="0.54.0" />
38+
<PackageVersion Include="System.CommandLine" Version="2.0.2" />
39+
</ItemGroup>
4040
</Project>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ audio effects, audio simulations, authentication, and more!
6666

6767
## Hosts
6868

69-
- Atrioxhosting €0.44/m: https://atrioxhost.com/voicecraft
69+
- Atrioxhosting €0.63/m: https://atrioxhost.com/voicecraft
7070

7171
## Project Dependencies
7272

‎VoiceCraft.Client/VoiceCraft.Client.Android/VoiceCraft.Client.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<TargetPlatformVersion>35</TargetPlatformVersion>
88
<Nullable>enable</Nullable>
99
<ApplicationId>com.AvionBlock.VoiceCraft.Client</ApplicationId>
10-
<ApplicationVersion>1</ApplicationVersion>
11-
<ApplicationDisplayVersion>1.3.0</ApplicationDisplayVersion>
10+
<ApplicationVersion>$(AndroidVersion)</ApplicationVersion>
11+
<ApplicationDisplayVersion>$(Version)</ApplicationDisplayVersion>
1212
<AndroidPackageFormat>apk</AndroidPackageFormat>
1313
<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
1414
<RunAOTCompilation>true</RunAOTCompilation>

‎VoiceCraft.Client/VoiceCraft.Client.Browser/NativeHotKeyService.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using VoiceCraft.Client.Services;
4+
5+
namespace VoiceCraft.Client.Browser;
6+
7+
public class NativeHotKeyService : HotKeyService
8+
{
9+
public NativeHotKeyService(IEnumerable<HotKeyAction> registeredHotKeyActions) : base(registeredHotKeyActions)
10+
{
11+
}
12+
13+
public override void Initialize()
14+
{
15+
}
16+
17+
public override void Dispose()
18+
{
19+
GC.SuppressFinalize(this);
20+
}
21+
}

‎VoiceCraft.Client/VoiceCraft.Client.Browser/Program.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ private static async Task Main(string[] _)
2424

2525
App.ServiceCollection.AddSingleton<AudioService, NativeAudioService>();
2626
App.ServiceCollection.AddSingleton<StorageService>(nativeStorage);
27+
App.ServiceCollection.AddSingleton<HotKeyService, NativeHotKeyService>();
2728
App.ServiceCollection.AddSingleton<BackgroundService, NativeBackgroundService>();
2829
App.ServiceCollection.AddTransient<Microsoft.Maui.ApplicationModel.Permissions.Microphone, Microphone>();
2930

‎VoiceCraft.Client/VoiceCraft.Client.Browser/VoiceCraft.Client.Browser.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<Nullable>enable</Nullable>
77
<WasmAllowUndefinedSymbols>true</WasmAllowUndefinedSymbols>
8+
<WasmBuildNative>true</WasmBuildNative>
89
</PropertyGroup>
910

1011
<ItemGroup>

‎VoiceCraft.Client/VoiceCraft.Client/Locales/nl-NL.json‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"VoipBackgroundError": "Voip achtergrondwerker fout: {0}"
2727
},
2828
"McWss": {
29-
"Badge": null,
30-
"Connected": null,
31-
"Disconnected": null
29+
"Badge": "McWss",
30+
"Connected": "McWss-verbinding tot stand gebracht: {0}",
31+
"Disconnected": "McWss-verbinding verbroken!"
3232
}
3333
},
3434
"Home": {
@@ -80,7 +80,7 @@
8080
"EchoCancelers": "Echo-onderdrukkers",
8181
"InputDevices": "Invoerapparaten",
8282
"MicrophoneSensitivity": "Microfoon gevoeligheid",
83-
"OutputVolume": null,
83+
"OutputVolume": "Uitgangsvolume",
8484
"OutputDevices": "Uitvoerapparaten",
8585
"TestOutput": "Uitvoer testen",
8686
"MicrophoneTest": {
@@ -90,15 +90,15 @@
9090
},
9191
"Network": {
9292
"Network": "Netwerk Instellingen",
93-
"PositioningType": null,
94-
"McWssListenIp": null,
95-
"McWssHostPort": "MCWSS host poort"
93+
"PositioningType": "Positioneringstype",
94+
"McWssListenIp": "MCWSS Luister IP-adres",
95+
"McWssHostPort": "MCWSS Host Poort"
9696
},
9797
"HotKey": {
98-
"HotKey": "Sneltoetsen",
98+
"HotKey": "Sneltoets",
9999
"Actions": {
100100
"Mute": "Dempen",
101-
"Deafen": "Doof maken"
101+
"Deafen": "Onhoorbaar maken"
102102
}
103103
},
104104
"Advanced": {
@@ -120,7 +120,7 @@
120120
"Motd": "Motd: {0}",
121121
"PositioningType": "Positioneringstype: {0}",
122122
"ConnectedClients": "Verbonden clients: {0}",
123-
"Version": null,
123+
"Version": "Versie: {0}",
124124
"Pinging": "Pingen..."
125125
}
126126
}
@@ -147,19 +147,27 @@
147147
"Init": "Denoiser is niet geïnitialiseerd!"
148148
}
149149
},
150+
"McWssServer": {
151+
"Exceptions": {
152+
"Failed": "Kan McWss Server niet starten! Controleer of een ander proces dezelfde poort gebruikt!,"
153+
}
154+
},
150155
"VoiceCraft": {
151156
"Status": {
152157
"Initializing": "Initialiseren...",
153158
"Connecting": "Verbinden...",
154159
"Connected": "Verbonden!",
155160
"Disconnected": "Verbinding verbroken! Reden: {0}"
156161
},
162+
"DescriptionStatus": {
163+
"McWss": "McWss luistert op: {0}:{1}"
164+
},
157165
"DisconnectReason": {
158166
"Manual": "Handmatig verbinding verbroken.",
159167
"ServerFull": "Server is vol!",
160168
"IncompatibleVersion": "Incompatibele client/server versie!",
161-
"ServerSidedOnly": null,
162-
"ClientSidedOnly": null,
169+
"ServerSidedOnly": "Server accepteert alleen positionering aan de serverzijde!",
170+
"ClientSidedOnly": "Server accepteert alleen positionering aan de clientzijde!",
163171
"Kicked": "Verwijderd!",
164172
"Shutdown": "Server afgesloten!",
165173
"Error": "Er is een fout opgetreden tijdens het verbinden!"

‎VoiceCraft.Client/VoiceCraft.Client/Locales/zh-CN.json‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"VoipBackgroundError": "VOIP背景服务错误: {0}"
2727
},
2828
"McWss": {
29-
"Badge": null,
30-
"Connected": null,
31-
"Disconnected": null
29+
"Badge": "McWss",
30+
"Connected": "McWss 连接已建立: {0}",
31+
"Disconnected": "McWss 连接已断开！"
3232
}
3333
},
3434
"Home": {
@@ -80,7 +80,7 @@
8080
"EchoCancelers": "回声消除器",
8181
"InputDevices": "输入设备",
8282
"MicrophoneSensitivity": "麦克风灵敏度",
83-
"OutputVolume": null,
83+
"OutputVolume": "输出音量",
8484
"OutputDevices": "输出设备",
8585
"TestOutput": "测试输出",
8686
"MicrophoneTest": {
@@ -90,8 +90,8 @@
9090
},
9191
"Network": {
9292
"Network": "网络设置",
93-
"PositioningType": null,
94-
"McWssListenIp": null,
93+
"PositioningType": "定位类型",
94+
"McWssListenIp": "MCWSS 监听IP地址",
9595
"McWssHostPort": "MCWSS主机端口"
9696
},
9797
"HotKey": {
@@ -116,11 +116,11 @@
116116
"ServerInfo": {
117117
"ServerInfo": "服务器信息",
118118
"Status": {
119-
"Latency": "延迟: {latency}",
120-
"Motd": "Motd: {motd}",
121-
"PositioningType": "定位类型: {positioningType}",
122-
"ConnectedClients": "已连接客户端: {connectedClients}",
123-
"Version": null,
119+
"Latency": "延迟: {0}",
120+
"Motd": "Motd: {0}",
121+
"PositioningType": "定位类型: {0}",
122+
"ConnectedClients": "已连接客户端: {0}",
123+
"Version": "版本: {0}",
124124
"Pinging": "正在Ping..."
125125
}
126126
}
@@ -147,22 +147,30 @@
147147
"Init": "降噪器未初始化！"
148148
}
149149
},
150+
"McWssServer": {
151+
"Exceptions": {
152+
"Failed": "无法启动 McWss 服务器! 请检查是否有其他进程正在使用相同的端口!"
153+
}
154+
},
150155
"VoiceCraft": {
151156
"Status": {
152157
"Initializing": "正在初始化...",
153158
"Connecting": "正在连接...",
154159
"Connected": "已连接！",
155-
"Disconnected": "已断开连接！原因: {reason}"
160+
"Disconnected": "已断开连接！原因: {0}"
161+
},
162+
"DescriptionStatus": {
163+
"McWss": "McWss 监听: {0}:{1}"
156164
},
157165
"DisconnectReason": {
158166
"Manual": "手动断开连接。",
159167
"ServerFull": "服务器已满！",
160168
"IncompatibleVersion": "客户端/服务器版本不兼容！",
161-
"ServerSidedOnly": null,
162-
"ClientSidedOnly": null,
169+
"ServerSidedOnly": "服务器只接受服务器端定位！",
170+
"ClientSidedOnly": "服务器只接受客户端定位！",
163171
"Kicked": "被踢出服务器！",
164172
"Shutdown": "服务器关闭！",
165173
"Error": "尝试登录时发生错误！"
166174
}
167175
}
168-
}
176+
}

‎VoiceCraft.Client/VoiceCraft.Client/Locales/zh-TW.json‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
"VoipBackgroundError": "VOIP背景服務錯誤: {0}"
2727
},
2828
"McWss": {
29-
"Badge": null,
30-
"Connected": null,
31-
"Disconnected": null
29+
"Badge": "McWss",
30+
"Connected": "McWss 連接已建立: {0}",
31+
"Disconnected": "McWss 連接已斷開！"
3232
}
3333
},
3434
"Home": {
@@ -80,7 +80,7 @@
8080
"EchoCancelers": "回聲消除器",
8181
"InputDevices": "輸入設備",
8282
"MicrophoneSensitivity": "麥克風靈敏度",
83-
"OutputVolume": null,
83+
"OutputVolume": "輸出音量",
8484
"OutputDevices": "輸出設備",
8585
"TestOutput": "測試輸出",
8686
"MicrophoneTest": {
@@ -90,8 +90,8 @@
9090
},
9191
"Network": {
9292
"Network": "網路設置",
93-
"PositioningType": null,
94-
"McWssListenIp": null,
93+
"PositioningType": "定位類型",
94+
"McWssListenIp": "MCWSS監聽IP地址",
9595
"McWssHostPort": "MCWSS主機端口"
9696
},
9797
"HotKey": {
@@ -116,11 +116,11 @@
116116
"ServerInfo": {
117117
"ServerInfo": "伺服器信息",
118118
"Status": {
119-
"Latency": "延遲: {latency}",
120-
"Motd": "Motd: {motd}",
121-
"PositioningType": "定位類型: {positioningType}",
122-
"ConnectedClients": "已連接客戶端: {connectedClients}",
123-
"Version": null,
119+
"Latency": "延遲: {0}",
120+
"Motd": "Motd: {0}",
121+
"PositioningType": "定位類型: {0}",
122+
"ConnectedClients": "已連接客戶端: {0}",
123+
"Version": "版本: {0}",
124124
"Pinging": "正在Ping..."
125125
}
126126
}
@@ -147,22 +147,30 @@
147147
"Init": "降噪器未初始化！"
148148
}
149149
},
150+
"McWssServer": {
151+
"Exceptions": {
152+
"Failed": "無法啟動 McWss 伺服器! 請檢查是否有其他進程正在使用相同的端口!"
153+
}
154+
},
150155
"VoiceCraft": {
151156
"Status": {
152157
"Initializing": "正在初始化...",
153158
"Connecting": "正在連接...",
154159
"Connected": "已連接！",
155-
"Disconnected": "已斷開連接！原因: {reason}"
160+
"Disconnected": "已斷開連接！原因: {0}"
161+
},
162+
"DescriptionStatus": {
163+
"McWss": "McWss 監聽: {0}:{1}"
156164
},
157165
"DisconnectReason": {
158166
"Manual": "手動斷開連接。",
159167
"ServerFull": "伺服器已滿！",
160168
"IncompatibleVersion": "客戶端/伺服器版本不兼容！",
161-
"ServerSidedOnly": null,
162-
"ClientSidedOnly": null,
169+
"ServerSidedOnly": "伺服器只接受伺服器端定位！",
170+
"ClientSidedOnly": "伺服器只接受客戶端定位！",
163171
"Kicked": "被踢出伺服器！",
164172
"Shutdown": "伺服器關閉！",
165173
"Error": "嘗試登錄時發生錯誤！"
166174
}
167175
}
168-
}
176+
}

0 commit comments

Comments
 (0)