Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor: Add FluentAvalonia and remake MainWindow #6

Merged
merged 2 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 2 additions & 93 deletions .gitignore
d3ara1n marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
# Created by https://www.toptal.com/developers/gitignore/api/visualstudio
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio

### VisualStudio ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
Expand Down Expand Up @@ -306,6 +302,8 @@ node_modules/
*.dsp

# Visual Studio 6 technical files
*.ncb
*.aps

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
Expand Down Expand Up @@ -398,92 +396,3 @@ FodyWeavers.xsd

# JetBrains Rider
*.sln.iml

### VisualStudio Patch ###
# Additional files built by Visual Studio

# End of https://www.toptal.com/developers/gitignore/api/visualstudio

### Rider ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# SonarLint plugin
.idea/sonarlint/

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

# All rider
.idea/

# End of https://www.toptal.com/developers/gitignore/api/rider
13 changes: 13 additions & 0 deletions .idea/.idea.Chief/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/.idea.Chief/.idea/avalonia.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.Chief/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.Chief/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Chief.sln
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chief", "Chief\Chief.csproj", "{5A85FCAF-DAAC-4CAE-BC5C-4D6D6A8294D9}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chief.App", "src\Chief.App\Chief.App.csproj", "{C36842CA-4C5F-4419-A7BF-2E148BC0D04F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChiefCore", "ChiefCore\ChiefCore.csproj", "{4D078273-78B7-4A5D-BD31-39FDD618968F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chief.Core", "src\Chief.Core\Chief.Core.csproj", "{1F067301-1F46-44F1-AA91-F7D42DAF1588}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5A85FCAF-DAAC-4CAE-BC5C-4D6D6A8294D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A85FCAF-DAAC-4CAE-BC5C-4D6D6A8294D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A85FCAF-DAAC-4CAE-BC5C-4D6D6A8294D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A85FCAF-DAAC-4CAE-BC5C-4D6D6A8294D9}.Release|Any CPU.Build.0 = Release|Any CPU
{4D078273-78B7-4A5D-BD31-39FDD618968F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4D078273-78B7-4A5D-BD31-39FDD618968F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D078273-78B7-4A5D-BD31-39FDD618968F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D078273-78B7-4A5D-BD31-39FDD618968F}.Release|Any CPU.Build.0 = Release|Any CPU
{C36842CA-4C5F-4419-A7BF-2E148BC0D04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C36842CA-4C5F-4419-A7BF-2E148BC0D04F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C36842CA-4C5F-4419-A7BF-2E148BC0D04F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C36842CA-4C5F-4419-A7BF-2E148BC0D04F}.Release|Any CPU.Build.0 = Release|Any CPU
{1F067301-1F46-44F1-AA91-F7D42DAF1588}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1F067301-1F46-44F1-AA91-F7D42DAF1588}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1F067301-1F46-44F1-AA91-F7D42DAF1588}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1F067301-1F46-44F1-AA91-F7D42DAF1588}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
7 changes: 1 addition & 6 deletions Chief.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,7 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Baozi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=pointover/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Viewbox/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=woodriver/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=woolang/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Avalonia/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
34 changes: 0 additions & 34 deletions Chief/App.axaml

This file was deleted.

40 changes: 0 additions & 40 deletions Chief/App.axaml.cs

This file was deleted.

56 changes: 0 additions & 56 deletions Chief/Chief.csproj

This file was deleted.

Loading