luxick/EstusShots-Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Avalonia based desktop client

Browse Source 
Squashed commit of the following:

commit 0bfba90cd31bc9d401bf25cd479f6aef314988d5
Author: luxick <git@luxick.de>
Date:   Mon Mar 2 21:58:32 2020 +0100

    Add view switching with Global.Navigator

commit e0f535152aaa31fc2d4b6712459d208e27831696
Author: luxick <git@luxick.de>
Date:   Mon Mar 2 20:53:01 2020 +0100

    Make ViewModels require api client

commit f66c9148fdb1c34a2b92321dfc7a053894f381ce
Author: luxick <git@luxick.de>
Date:   Mon Mar 2 20:51:35 2020 +0100

    Update framework to core 3.1

commit 273b2940f043d889c70e8d7a69a54d6b4b200a62
Author: luxick <git@luxick.de>
Date:   Mon Mar 2 20:49:43 2020 +0100

    Player and Season View/Models

commit b3325b176740c403381009882c98a401ece05d0a
Author: luxick <git@luxick.de>
Date:   Mon Mar 2 20:44:55 2020 +0100

    Add EstusShots.Avalonia project
This commit is contained in:
luxick
2020-03-02 22:02:19 +01:00
parent 3e72acf71a
commit 687c3ffbfa
21 changed files with 702 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

337
EstusShots.Avalonia/.gitignore vendored Normal file
View File

@@ -0,0 +1,337 @@
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
## Visual Studio Code specific files and folder
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.jsons
# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
# Visual Studio 2015/2017 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
# NUNIT
*.VisualState.xml
TestResult.xml
# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c
# Benchmark Results
BenchmarkDotNet.Artifacts/
# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.iobj
*.pch
*.pdb
*.ipdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc
# Chutzpah Test files
_Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb
# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# JustCode is a .NET coding add-in
.JustCode
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*
# MightyMoose
*.mm.*
AutoTest.Net/
# Web workbench (sass)
.sass-cache/
# Installshield output folder
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj
# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Microsoft Azure Build Output
csx/
*.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt
*.appx
# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files
*.mdf
*.ldf
*.ndf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
*.rptproj.rsuser
# Microsoft Fakes
FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/
# Visual Studio 6 build log
*.plg
# Visual Studio 6 workspace options file
*.opt
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
paket-files/
# FAKE - F# Make
.fake/
# JetBrains Rider
.idea/
*.sln.iml
# CodeRush
.cr/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc
# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config
# Tabs Studio
*.tss
# Telerik's JustMock configuration file
*.jmconfig
# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/

13
EstusShots.Avalonia/App.xaml Normal file
View File

@@ -0,0 +1,13 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:EstusShots.Avalonia"
x:Class="EstusShots.Avalonia.App">
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>
<Application.Styles>
<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseDark.xaml"/>
</Application.Styles>
</Application>

44
EstusShots.Avalonia/App.xaml.cs Normal file
View File

@@ -0,0 +1,44 @@
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Markup.Xaml;
using EstusShots.Avalonia.ViewModels;
using EstusShots.Avalonia.Views;
using EstusShots.Client;
using Microsoft.Extensions.DependencyInjection;
namespace EstusShots.Avalonia
{
public class App : Application
{
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}
public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
// The Application uses a single shared API client.
var apiClient = new EstusShotsClient("http://localhost:5000/api/");
// Add all our services to the DI Container
var serviceProvider = new ServiceCollection()
.AddSingleton(apiClient)
.AddViewModels()
.BuildServiceProvider();
var main = new MainWindowViewModel(serviceProvider);
Global.Navigator = new Navigator(main);
Global.Navigator.GoTo<SeasonsViewModel>();
desktop.MainWindow = new MainWindow
{
DataContext = main,
};
}
base.OnFrameworkInitializationCompleted();
}
}
}

BIN
EstusShots.Avalonia/Assets/avalonia-logo.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 172 KiB

25
EstusShots.Avalonia/EstusShots.Avalonia.csproj Normal file
View File

@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Folder Include="Models\" />
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
</Compile>
<AvaloniaResource Include="**\*.xaml">
<SubType>Designer</SubType>
</AvaloniaResource>
<AvaloniaResource Include="Assets\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.0" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EstusShots.Client\EstusShots.Client.csproj" />
</ItemGroup>
</Project>

16
EstusShots.Avalonia/Extensions.cs Normal file
View File

@@ -0,0 +1,16 @@
using System.Linq;
using System.Reflection;
using Microsoft.Extensions.DependencyInjection;
namespace EstusShots.Avalonia
{
public static class Extensions
{
public static IServiceCollection AddViewModels(this IServiceCollection @this)
{
var viewModels = Assembly.GetExecutingAssembly().GetTypes().Where(x => x.Name.EndsWith("ViewModel"));
viewModels.ForEach(x => @this.AddSingleton(x));
return @this;
}
}
}

26
EstusShots.Avalonia/Global.cs Normal file
View File

@@ -0,0 +1,26 @@
using EstusShots.Avalonia.ViewModels;
namespace EstusShots.Avalonia
{
public static class Global
{
public static Navigator Navigator;
}
public class Navigator
{
private readonly MainWindowViewModel _model;
public Navigator(MainWindowViewModel model)
{
_model = model;
}
public void GoTo<TViewModel>() where TViewModel : ViewModelBase
{
var o = _model.Container.GetService(typeof(TViewModel));
if (!(o is ViewModelBase viewModel)) return;
_model.Content = viewModel;
}
}
}

24
EstusShots.Avalonia/Program.cs Normal file
View File

@@ -0,0 +1,24 @@
using System;
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI;
namespace EstusShots.Avalonia
{
class Program
{
// Initialization code. Don't use any Avalonia, third-party APIs or any
// SynchronizationContext-reliant code before AppMain is called: things aren't initialized
// yet and stuff might break.
public static void Main(string[] args) => BuildAvaloniaApp()
.StartWithClassicDesktopLifetime(args);
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.LogToDebug()
.UseReactiveUI();
}
}

35
EstusShots.Avalonia/ViewLocator.cs Normal file
View File

@@ -0,0 +1,35 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using EstusShots.Avalonia.ViewModels;
namespace EstusShots.Avalonia
{
public class ViewLocator : IDataTemplate
{
public bool SupportsRecycling => false;
public IControl Build(object data)
{
var name = data.GetType().FullName.Replace("ViewModel", "View");
var type = Type.GetType(name);
if (type != null)
{
return (Control)Activator.CreateInstance(type);
}
else
{
return new TextBlock { Text = "Not Found: " + name };
}
}
public bool Match(object data)
{
return data is ViewModelBase;
}
}
}

25
EstusShots.Avalonia/ViewModels/MainWindowViewModel.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using ReactiveUI;
namespace EstusShots.Avalonia.ViewModels
{
public class MainWindowViewModel : ViewModelBase
{
public IServiceProvider Container;
private ViewModelBase _content;
public MainWindowViewModel(IServiceProvider container)
{
Container = container;
}
public ViewModelBase Content
{
get => _content;
set => this.RaiseAndSetIfChanged(ref _content, value);
}
}
}

14
EstusShots.Avalonia/ViewModels/PlayersViewModel.cs Normal file
View File

@@ -0,0 +1,14 @@
using EstusShots.Client;
namespace EstusShots.Avalonia.ViewModels
{
public class PlayersViewModel : ViewModelBase
{
private readonly EstusShotsClient _apiClient;
public PlayersViewModel(EstusShotsClient apiClient)
{
_apiClient = apiClient;
}
}
}

26
EstusShots.Avalonia/ViewModels/SeasonsViewModel.cs Normal file
View File

@@ -0,0 +1,26 @@
using System.Collections.Generic;
using System.Reactive;
using EstusShots.Client;
using EstusShots.Shared.Dto;
using ReactiveUI;
namespace EstusShots.Avalonia.ViewModels
{
public class SeasonsViewModel : ViewModelBase
{
private readonly EstusShotsClient _apiClient;
private readonly MainWindowViewModel _main;
public List<Season> Seasons { get; set; }
public ReactiveCommand<Unit, Unit> ToPlayers { get; }
public SeasonsViewModel(EstusShotsClient apiClient, MainWindowViewModel main)
{
_apiClient = apiClient;
_main = main;
ToPlayers = ReactiveCommand.Create(() => { Global.Navigator.GoTo<PlayersViewModel>(); });
}
}
}

11
EstusShots.Avalonia/ViewModels/ViewModelBase.cs Normal file
View File

@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Text;
using ReactiveUI;
namespace EstusShots.Avalonia.ViewModels
{
public class ViewModelBase : ReactiveObject
{
}
}

10
EstusShots.Avalonia/Views/MainWindow.xaml Normal file
View File

@@ -0,0 +1,10 @@
<Window 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"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="EstusShots.Avalonia.Views.MainWindow"
Icon="/Assets/avalonia-logo.ico"
Title="EstusShots.Avalonia"
Content="{Binding Content}">
</Window>

19
EstusShots.Avalonia/Views/MainWindow.xaml.cs Normal file
View File

@@ -0,0 +1,19 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace EstusShots.Avalonia.Views
{
public class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}

12
EstusShots.Avalonia/Views/PlayersView.xaml Normal file
View File

@@ -0,0 +1,12 @@
<UserControl 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"
xmlns:vm="clr-namespace:EstusShots.Avalonia.ViewModels;assembly=EstusShots.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="EstusShots.Avalonia.Views.PlayersView">
<Design.DataContext>
<vm:PlayersViewModel/>
</Design.DataContext>
<TextBlock Text="This is the Players View" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</UserControl>

19
EstusShots.Avalonia/Views/PlayersView.xaml.cs Normal file
View File

@@ -0,0 +1,19 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace EstusShots.Avalonia.Views
{
public class PlayersView : UserControl
{
public PlayersView()
{
InitializeComponent();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}

15
EstusShots.Avalonia/Views/SeasonsView.xaml Normal file
View File

@@ -0,0 +1,15 @@
<UserControl 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"
xmlns:vm="clr-namespace:EstusShots.Avalonia.ViewModels;assembly=EstusShots.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="EstusShots.Avalonia.Views.SeasonsView">
<Design.DataContext>
<vm:SeasonsViewModel />
</Design.DataContext>
<StackPanel>
<TextBlock Text="This is the Seasons View" HorizontalAlignment="Center" VerticalAlignment="Center" />
<Button Command="{Binding ToPlayers}" Content="To the players" />
</StackPanel>
</UserControl>

19
EstusShots.Avalonia/Views/SeasonsView.xaml.cs Normal file
View File

@@ -0,0 +1,19 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace EstusShots.Avalonia.Views
{
public class SeasonsView : UserControl
{
public SeasonsView()
{
InitializeComponent();
}
private void InitializeComponent()
{
AvaloniaXamlLoader.Load(this);
}
}
}

6
EstusShots.Avalonia/nuget.config Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
</packageSources>
</configuration>

6
EstusShots.sln
View File

@@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstusShots.Gtk", "EstusShot
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstusShots.Client", "EstusShots.Client\EstusShots.Client.csproj", "{9D2CCB23-6232-4587-AA95-24ADA96569E8}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstusShots.Client", "EstusShots.Client\EstusShots.Client.csproj", "{9D2CCB23-6232-4587-AA95-24ADA96569E8}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EstusShots.Avalonia", "EstusShots.Avalonia\EstusShots.Avalonia.csproj", "{922F62BA-B5F9-448D-A7CB-7396B07A1650}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@@ -30,5 +32,9 @@ Global
{9D2CCB23-6232-4587-AA95-24ADA96569E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {9D2CCB23-6232-4587-AA95-24ADA96569E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D2CCB23-6232-4587-AA95-24ADA96569E8}.Release|Any CPU.ActiveCfg = Release|Any CPU {9D2CCB23-6232-4587-AA95-24ADA96569E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9D2CCB23-6232-4587-AA95-24ADA96569E8}.Release|Any CPU.Build.0 = Release|Any CPU {9D2CCB23-6232-4587-AA95-24ADA96569E8}.Release|Any CPU.Build.0 = Release|Any CPU
{922F62BA-B5F9-448D-A7CB-7396B07A1650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{922F62BA-B5F9-448D-A7CB-7396B07A1650}.Debug|Any CPU.Build.0 = Debug|Any CPU
{922F62BA-B5F9-448D-A7CB-7396B07A1650}.Release|Any CPU.ActiveCfg = Release|Any CPU
{922F62BA-B5F9-448D-A7CB-7396B07A1650}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal