From 9fb51786cc4a2da79df29261ba6a2b2516e7171f Mon Sep 17 00:00:00 2001 From: timunie Date: Thu, 5 Oct 2023 21:24:16 +0200 Subject: [PATCH] Refactor: Move Dialog samples into ViewInteraction. --- src/Avalonia.Samples/Avalonia.Samples.sln | 10 ++++++---- .../AdvancedMvvmDialogSample/.gitignore | 0 .../AdvancedMvvmDialogSample.csproj | 0 .../AdvancedMvvmDialogSample/App.axaml | 0 .../AdvancedMvvmDialogSample/App.axaml.cs | 0 .../Assets/avalonia-logo.ico | Bin .../AdvancedMvvmDialogSample/Program.cs | 0 .../AdvancedMvvmDialogSample/README.adoc | 0 .../Services/DialogService.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../ViewModels/ViewModelBase.cs | 0 .../AdvancedMvvmDialogSample/Views/MainWindow.axaml | 0 .../Views/MainWindow.axaml.cs | 0 .../MvvmDialogSample/.gitignore | 0 .../MvvmDialogSample/App.axaml | 0 .../MvvmDialogSample/App.axaml.cs | 0 .../MvvmDialogSample/Assets/avalonia-logo.ico | Bin .../MvvmDialogSample/Core/Interaction.cs | 0 .../MvvmDialogSample/MvvmDialogSample.csproj | 0 .../MvvmDialogSample/Program.cs | 0 .../MvvmDialogSample/README.adoc | 0 .../ViewModels/CustomInteractionViewModel.cs | 0 .../ViewModels/InteractionViewModel.cs | 0 .../ViewModels/MainWindowViewModel.cs | 0 .../MvvmDialogSample/ViewModels/ViewModelBase.cs | 0 .../Views/CustomInteractionView.axaml | 0 .../Views/CustomInteractionView.axaml.cs | 0 .../MvvmDialogSample/Views/InteractionView.axaml | 0 .../MvvmDialogSample/Views/InteractionView.axaml.cs | 0 .../MvvmDialogSample/Views/MainWindow.axaml | 0 .../MvvmDialogSample/Views/MainWindow.axaml.cs | 0 31 files changed, 6 insertions(+), 4 deletions(-) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/.gitignore (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/AdvancedMvvmDialogSample.csproj (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/App.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/App.axaml.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/Assets/avalonia-logo.ico (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/Program.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/README.adoc (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/Services/DialogService.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/ViewModels/MainWindowViewModel.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/ViewModels/ViewModelBase.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/Views/MainWindow.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/AdvancedMvvmDialogSample/Views/MainWindow.axaml.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/.gitignore (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/App.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/App.axaml.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Assets/avalonia-logo.ico (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Core/Interaction.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/MvvmDialogSample.csproj (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Program.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/README.adoc (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/ViewModels/CustomInteractionViewModel.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/ViewModels/InteractionViewModel.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/ViewModels/MainWindowViewModel.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/ViewModels/ViewModelBase.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/CustomInteractionView.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/CustomInteractionView.axaml.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/InteractionView.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/InteractionView.axaml.cs (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/MainWindow.axaml (100%) rename src/Avalonia.Samples/{MVVM => ViewInteraction}/MvvmDialogSample/Views/MainWindow.axaml.cs (100%) diff --git a/src/Avalonia.Samples/Avalonia.Samples.sln b/src/Avalonia.Samples/Avalonia.Samples.sln index 5688671..39eb326 100644 --- a/src/Avalonia.Samples/Avalonia.Samples.sln +++ b/src/Avalonia.Samples/Avalonia.Samples.sln @@ -38,9 +38,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Folder", "Solution ..\..\README.adoc = ..\..\README.adoc EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmDialogSample", "MVVM\MvvmDialogSample\MvvmDialogSample.csproj", "{48432457-6A55-4D03-9D40-260CE8E06440}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MvvmDialogSample", "ViewInteraction\MvvmDialogSample\MvvmDialogSample.csproj", "{48432457-6A55-4D03-9D40-260CE8E06440}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedMvvmDialogSample", "MVVM\AdvancedMvvmDialogSample\AdvancedMvvmDialogSample.csproj", "{0BC90E92-D8B3-4C6D-8C47-BAF57CD73CBA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AdvancedMvvmDialogSample", "ViewInteraction\AdvancedMvvmDialogSample\AdvancedMvvmDialogSample.csproj", "{0BC90E92-D8B3-4C6D-8C47-BAF57CD73CBA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{85B157B3-F701-4F75-B4F1-EC2287729480}" EndProject @@ -52,6 +52,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestableApp.Headless.XUnit" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestableApp.Appium", "Testing\TestableApp.Appium\TestableApp.Appium.csproj", "{F5CB3DA2-EB59-4792-A1B3-49F600F7C130}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ViewInteraction", "ViewInteraction", "{2E99F15F-A82A-4734-A837-C0F768702600}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,12 +139,12 @@ Global {53239038-E234-4DEF-B730-953B2F43B51E} = {932FD4A5-FCE7-4428-A0C1-C0392D90A21A} {CC74DC68-A0A5-40A2-9A4D-CF110685D8C4} = {92C71AA7-E791-40C0-9F3A-2A85880B0439} {17F36A0B-940E-49DB-B5B5-38C38E0947EE} = {D02161B3-8242-4BF5-96E9-780465A5023B} - {48432457-6A55-4D03-9D40-260CE8E06440} = {932FD4A5-FCE7-4428-A0C1-C0392D90A21A} - {0BC90E92-D8B3-4C6D-8C47-BAF57CD73CBA} = {932FD4A5-FCE7-4428-A0C1-C0392D90A21A} {326EF526-6200-4570-90DE-5E6D48B63EAC} = {85B157B3-F701-4F75-B4F1-EC2287729480} {B8CB5C57-07ED-4BC6-ACE8-F05E428E3EB5} = {85B157B3-F701-4F75-B4F1-EC2287729480} {BDA7536E-26FD-436F-AAC8-F8A2B500548E} = {85B157B3-F701-4F75-B4F1-EC2287729480} {F5CB3DA2-EB59-4792-A1B3-49F600F7C130} = {85B157B3-F701-4F75-B4F1-EC2287729480} + {48432457-6A55-4D03-9D40-260CE8E06440} = {2E99F15F-A82A-4734-A837-C0F768702600} + {0BC90E92-D8B3-4C6D-8C47-BAF57CD73CBA} = {2E99F15F-A82A-4734-A837-C0F768702600} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C246CAB0-0837-4EE4-A22D-28B3C74930B4} diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/.gitignore b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/.gitignore similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/.gitignore rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/.gitignore diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/AdvancedMvvmDialogSample.csproj b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/AdvancedMvvmDialogSample.csproj similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/AdvancedMvvmDialogSample.csproj rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/AdvancedMvvmDialogSample.csproj diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/App.axaml b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/App.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/App.axaml rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/App.axaml diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/App.axaml.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/App.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/App.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/App.axaml.cs diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Assets/avalonia-logo.ico b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Assets/avalonia-logo.ico similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Assets/avalonia-logo.ico rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Assets/avalonia-logo.ico diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Program.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Program.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Program.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Program.cs diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/README.adoc b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/README.adoc similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/README.adoc rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/README.adoc diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Services/DialogService.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Services/DialogService.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Services/DialogService.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Services/DialogService.cs diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/ViewModels/MainWindowViewModel.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/ViewModels/MainWindowViewModel.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/ViewModels/MainWindowViewModel.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/ViewModels/MainWindowViewModel.cs diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/ViewModels/ViewModelBase.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/ViewModels/ViewModelBase.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/ViewModels/ViewModelBase.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/ViewModels/ViewModelBase.cs diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Views/MainWindow.axaml b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Views/MainWindow.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Views/MainWindow.axaml rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Views/MainWindow.axaml diff --git a/src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Views/MainWindow.axaml.cs b/src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Views/MainWindow.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/AdvancedMvvmDialogSample/Views/MainWindow.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/AdvancedMvvmDialogSample/Views/MainWindow.axaml.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/.gitignore b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/.gitignore similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/.gitignore rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/.gitignore diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/App.axaml b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/App.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/App.axaml rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/App.axaml diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/App.axaml.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/App.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/App.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/App.axaml.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Assets/avalonia-logo.ico b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Assets/avalonia-logo.ico similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Assets/avalonia-logo.ico rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Assets/avalonia-logo.ico diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Core/Interaction.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Core/Interaction.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Core/Interaction.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Core/Interaction.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/MvvmDialogSample.csproj b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/MvvmDialogSample.csproj rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/MvvmDialogSample.csproj diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Program.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Program.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Program.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Program.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/README.adoc b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/README.adoc similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/README.adoc rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/README.adoc diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/CustomInteractionViewModel.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/CustomInteractionViewModel.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/CustomInteractionViewModel.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/CustomInteractionViewModel.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/InteractionViewModel.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/InteractionViewModel.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/InteractionViewModel.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/InteractionViewModel.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/MainWindowViewModel.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/MainWindowViewModel.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/MainWindowViewModel.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/MainWindowViewModel.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/ViewModelBase.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/ViewModelBase.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/ViewModels/ViewModelBase.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/ViewModels/ViewModelBase.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/CustomInteractionView.axaml b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/CustomInteractionView.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/CustomInteractionView.axaml rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/CustomInteractionView.axaml diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/CustomInteractionView.axaml.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/CustomInteractionView.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/CustomInteractionView.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/CustomInteractionView.axaml.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/InteractionView.axaml b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/InteractionView.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/InteractionView.axaml rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/InteractionView.axaml diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/InteractionView.axaml.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/InteractionView.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/InteractionView.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/InteractionView.axaml.cs diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/MainWindow.axaml b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/MainWindow.axaml similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/MainWindow.axaml rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/MainWindow.axaml diff --git a/src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/MainWindow.axaml.cs b/src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/MainWindow.axaml.cs similarity index 100% rename from src/Avalonia.Samples/MVVM/MvvmDialogSample/Views/MainWindow.axaml.cs rename to src/Avalonia.Samples/ViewInteraction/MvvmDialogSample/Views/MainWindow.axaml.cs