Skip to content

Commit 4311459

Browse files
authored
Merge pull request #107 from Grange007/dev
Rebuild: ♻️Reconstruct MAUI Client with MVVM
2 parents f3aaa56 + 94f7c47 commit 4311459

25 files changed

+2975
-1291
lines changed

logic/Client/App.xaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Setter Property="HorizontalOptions" Value="Start" />
1717
<Setter Property="FontSize" Value="Micro" />
1818
</Style>
19+
1920
</ResourceDictionary>
2021

2122

logic/Client/Client.csproj

+12-12
Original file line numberDiff line numberDiff line change
@@ -49,43 +49,43 @@
4949
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
5050
</ItemGroup>
5151

52+
<ItemGroup>
53+
<None Remove="View\uhlobqco.ueo~" />
54+
</ItemGroup>
55+
5256

5357
<ItemGroup>
58+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
5459
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
5560
<PackageReference Include="Grpc" Version="2.46.6" />
56-
<PackageReference Include="Grpc.Tools" Version="2.62.0">
61+
<PackageReference Include="Grpc.Tools" Version="2.60.0">
5762
<PrivateAssets>all</PrivateAssets>
5863
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5964
</PackageReference>
6065
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
6166
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.6" />
67+
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
6268
</ItemGroup>
6369

6470

6571
<ItemGroup>
66-
<Compile Update="MainPage.xaml.cs">
72+
<Compile Update="View\MainPage.xaml.cs">
6773
<DependentUpon>MainPage.xaml</DependentUpon>
6874
</Compile>
69-
<Compile Update="Map.xaml.cs">
70-
<DependentUpon>Map.xaml</DependentUpon>
71-
</Compile>
72-
<Compile Update="GameStatusBar.xaml.cs">
75+
<Compile Update="Old\GameStatusBar.xaml.cs">
7376
<DependentUpon>GameStatusBar.xaml</DependentUpon>
7477
</Compile>
75-
<Compile Update="PlayerStatusBar.xaml.cs">
78+
<Compile Update="Old\PlayerStatusBar.xaml.cs">
7679
<DependentUpon>PlayerStatusBar.xaml</DependentUpon>
7780
</Compile>
7881
</ItemGroup>
7982

8083

8184
<ItemGroup>
82-
<MauiXaml Update="Map.xaml">
83-
<Generator>MSBuild:Compile</Generator>
84-
</MauiXaml>
85-
<MauiXaml Update="GameStatusBar.xaml">
85+
<MauiXaml Update="Old\GameStatusBar.xaml">
8686
<Generator>MSBuild:Compile</Generator>
8787
</MauiXaml>
88-
<MauiXaml Update="PlayerStatusBar.xaml">
88+
<MauiXaml Update="Old\PlayerStatusBar.xaml">
8989
<Generator>MSBuild:Compile</Generator>
9090
</MauiXaml>
9191
</ItemGroup>

logic/Client/CommandLine.cs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.CommandLine;
7+
8+
namespace Client
9+
{
10+
public class CommandLine
11+
{
12+
13+
}
14+
}

logic/Client/MainPage.xaml

-47
This file was deleted.

0 commit comments

Comments
 (0)