From 498eed10f53badf27e19476bb67a67bbd9e9bfea Mon Sep 17 00:00:00 2001
From: Sander van Vliet <sander@codenizer.nl>
Date: Tue, 21 Nov 2023 14:33:28 +0100
Subject: [PATCH] Remove open route dialog

---
 .../DelegateDecorator.cs                      |   5 -
 .../IWindowService.cs                         |   1 -
 .../RoadCaptain.App.RouteBuilder.csproj       |   6 -
 .../Views/OpenRouteDialog.axaml               | 116 ------------------
 .../Views/OpenRouteDialog.axaml.cs            |  71 -----------
 .../Views/RouteSegmentListView.axaml.cs       |   1 -
 .../WindowService.cs                          |  18 ---
 7 files changed, 218 deletions(-)
 delete mode 100644 src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml
 delete mode 100644 src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml.cs

diff --git a/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs b/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs
index e1a161ff..bb0dcdff 100644
--- a/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs
+++ b/src/RoadCaptain.App.RouteBuilder/DelegateDecorator.cs
@@ -65,11 +65,6 @@ public async Task ShowWhatIsNewDialog(Release release)
             return await InvokeIfNeededAsync(() => _decorated.ShowSaveFileDialog(previousLocation, suggestedFileName));
         }
 
-        public async Task<(PlannedRoute? PlannedRoute, string? RouteFilePath)> ShowOpenRouteDialog()
-        {
-            return await InvokeIfNeededAsync(() => _decorated.ShowOpenRouteDialog());
-        }
-
         public async Task<MessageBoxResult> ShowQuestionDialog(string title, string message)
         {
         return await InvokeIfNeededAsync(() => _decorated.ShowQuestionDialog(title, message));
diff --git a/src/RoadCaptain.App.RouteBuilder/IWindowService.cs b/src/RoadCaptain.App.RouteBuilder/IWindowService.cs
index 4822d525..35080364 100644
--- a/src/RoadCaptain.App.RouteBuilder/IWindowService.cs
+++ b/src/RoadCaptain.App.RouteBuilder/IWindowService.cs
@@ -22,7 +22,6 @@ public interface IWindowService : RoadCaptain.App.Shared.IWindowService
         Task<TokenResponse?> ShowLogInDialog(Window owner);
         Window? GetCurrentWindow();
         Task<string?> ShowSaveFileDialog(string? previousLocation, string? suggestedFileName = null);
-        Task<(PlannedRoute? PlannedRoute, string? RouteFilePath)> ShowOpenRouteDialog();
         Task<MessageBoxResult> ShowQuestionDialog(string title, string message);
     }
 }
\ No newline at end of file
diff --git a/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj b/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
index 01bc83b2..c27cc8ea 100644
--- a/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
+++ b/src/RoadCaptain.App.RouteBuilder/RoadCaptain.App.RouteBuilder.csproj
@@ -67,10 +67,4 @@
 	  <Folder Include="Controls\" />
 	  <Folder Include="UseCases\" />
 	</ItemGroup>
-	<ItemGroup>
-	  <Compile Update="Views\OpenRouteDialog.axaml.cs">
-	    <DependentUpon>OpenRouteDialog.axaml</DependentUpon>
-	    <SubType>Code</SubType>
-	  </Compile>
-	</ItemGroup>
 </Project>
diff --git a/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml b/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml
deleted file mode 100644
index 1f803117..00000000
--- a/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-// Copyright (c) 2023 Sander van Vliet
-// Licensed under Artistic License 2.0
-// See LICENSE or https://choosealicense.com/licenses/artistic-2.0/
--->
-
-<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"
-        xmlns:viewModels="using:RoadCaptain.App.RouteBuilder.ViewModels"
-        xmlns:converters="clr-namespace:RoadCaptain.App.Shared.Converters;assembly=RoadCaptain.App.Shared"
-        mc:Ignorable="d" Width="600" Height="230"
-        x:Class="RoadCaptain.App.RouteBuilder.Views.OpenRouteDialog"
-        Title="Open route"
-        Icon="avares://RoadCaptain.App.Shared/icon.png"
-        Background="Transparent"
-        TransparencyLevelHint="Transparent"
-        CanResize="False"
-        SystemDecorations="None"
-        WindowStartupLocation="CenterOwner"
-        Activated="WindowBase_OnActivated"
-        PointerPressed="InputElement_OnPointerPressed">
-	<Design.DataContext>
-		<viewModels:DesignTimeOpenRouteDialogViewModel />
-	</Design.DataContext>
-	<Window.Resources>
-		<converters:NullabilityConverter x:Key="NullabilityConverter" />
-	</Window.Resources>
-	<Border BorderBrush="DarkGray" BorderThickness="1" CornerRadius="8" Opacity="1" Background="White">
-		<Grid Margin="4">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="30" />
-				<!-- banner -->
-				<RowDefinition Height="*" />
-				<!-- main content-->
-				<RowDefinition Height="40" />
-				<!-- bottom button row -->
-			</Grid.RowDefinitions>
-
-			<StackPanel Orientation="Horizontal" Grid.Row="0">
-				<Image Source="avares://RoadCaptain.App.Shared/icon.png" Height="24" VerticalAlignment="Center" Margin="4,0,4,0" />
-				<TextBlock Text="Open route" FontWeight="ExtraBold" FontSize="24" VerticalAlignment="Center" Margin="0,1,0,0" />
-			</StackPanel>
-			<Button Content="X" Background="Red" Foreground="White" Grid.Row="0" HorizontalAlignment="Right" Width="40" Height="20" Margin="0,-3,-3,0" VerticalAlignment="Top"
-                    Click="CloseButton_Click" FontSize="14">
-				<Button.Styles>
-					<Style Selector="Button">
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="Button">
-									<Border Name="borderZero" Background="{TemplateBinding Background}" CornerRadius="0,8,0,0">
-										<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}"/>
-									</Border>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-				</Button.Styles>
-			</Button>
-
-			<Grid Grid.Row="1" ZIndex="2" Margin="8,32,0,0">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="120" />
-					<ColumnDefinition />
-					<ColumnDefinition Width="84" />
-				</Grid.ColumnDefinitions>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="32" />
-					<RowDefinition Height="32" />
-				</Grid.RowDefinitions>
-				<Grid.Styles>
-					<Style Selector="TextBox">
-						<Setter Property="Margin" Value="0,0,0,8"/>
-						<Setter Property="TextWrapping" Value="NoWrap" />
-					</Style>
-					<Style Selector="TextBlock.field">
-						<Setter Property="VerticalAlignment" Value="Top" />
-						<Setter Property="HorizontalAlignment" Value="Right"/>
-						<Setter Property="Margin" Value="0,6,4,0"/>
-					</Style>
-				</Grid.Styles>
-
-				<StackPanel Orientation="Horizontal"
-				            Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"
-				            HorizontalAlignment="Center">
-					<Button Content="Search" 
-					        Command="{Binding Path=SelectRouteCommand}"/>
-					<TextBlock Text="a route or" VerticalAlignment="Center" Margin="4,0,0,0" />
-
-					<Button Content="Open" Width="76" Margin="8,0,0,0" VerticalAlignment="Center" Command="{Binding Path=SelectFileCommand}" />
-					<TextBlock Text="a local file" VerticalAlignment="Center" Margin="4,0,0,0" />
-				</StackPanel>
-				
-				<StackPanel Orientation="Horizontal"
-				            Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
-				            HorizontalAlignment="Center"
-				            IsVisible="{Binding Path=SelectedRouteName, Converter={StaticResource NullabilityConverter}}"
-				            Margin="0,16,0,0">
-					<TextBlock Text="Selected route:" VerticalAlignment="Center" FontWeight="Bold" />
-					<TextBlock Text="{Binding Path=SelectedRouteName, FallbackValue='Search for a route'}" Margin="8,0,0,0" VerticalAlignment="Center"/>
-				</StackPanel>
-			</Grid>
-
-			<!-- Bottom row -->
-			<Button
-                Grid.Row="2"
-                Content="Cancel" HorizontalAlignment="Right" Margin="2,4,70,2" VerticalAlignment="Center"
-                Click="CloseButton_Click" />
-			<Button
-                Grid.Row="2"
-                Content="Open" HorizontalAlignment="Right" Margin="2,4,4,2" VerticalAlignment="Center"
-                Command="{Binding Path=OpenRouteCommand}" />
-		</Grid>
-	</Border>
-</Window>
diff --git a/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml.cs b/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml.cs
deleted file mode 100644
index 552b3a3a..00000000
--- a/src/RoadCaptain.App.RouteBuilder/Views/OpenRouteDialog.axaml.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2023 Sander van Vliet
-// Licensed under Artistic License 2.0
-// See LICENSE or https://choosealicense.com/licenses/artistic-2.0/
-
-using System;
-using Avalonia;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Avalonia.Markup.Xaml;
-using Avalonia.Threading;
-using RoadCaptain.App.RouteBuilder.ViewModels;
-using RoadCaptain.App.Shared.Dialogs;
-
-namespace RoadCaptain.App.RouteBuilder.Views
-{
-    public partial class OpenRouteDialog : DialogWindow
-    {
-        public OpenRouteDialog()
-        {
-            InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        private void CloseButton_Click(object? sender, RoutedEventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-
-        private void InputElement_OnPointerPressed(object? sender, PointerPressedEventArgs e)
-        {
-            if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed)
-            {
-                BeginMoveDrag(e);
-            }
-        }
-
-        private void WindowBase_OnActivated(object? sender, EventArgs e)
-        {
-            // Remove event handler to ensure this is only called once
-            Activated -= WindowBase_OnActivated;
-            
-            if (DataContext is OpenRouteDialogViewModel viewModel)
-            {
-                viewModel.ShouldClose += (_, _) =>
-                {
-                    if (!Dispatcher.UIThread.CheckAccess())
-                    {
-                        Dispatcher.UIThread.InvokeAsync(Close);
-                    }
-                    else
-                    {
-                        DialogResult = viewModel.SelectedRoute != null || !string.IsNullOrEmpty(viewModel.RouteFilePath)
-                            ? DialogResult.Ok
-                            : DialogResult.Cancel;
-                        
-                        Close();
-                    }
-                };
-            }
-        }
-    }
-}
-
diff --git a/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs b/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
index 235fa472..71d3e639 100644
--- a/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
+++ b/src/RoadCaptain.App.RouteBuilder/Views/RouteSegmentListView.axaml.cs
@@ -1,5 +1,4 @@
 using System.Linq;
-using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using RoadCaptain.App.RouteBuilder.ViewModels;
diff --git a/src/RoadCaptain.App.RouteBuilder/WindowService.cs b/src/RoadCaptain.App.RouteBuilder/WindowService.cs
index fd7ec971..a2366524 100644
--- a/src/RoadCaptain.App.RouteBuilder/WindowService.cs
+++ b/src/RoadCaptain.App.RouteBuilder/WindowService.cs
@@ -160,24 +160,6 @@ public async Task ShowSaveRouteDialog(string? lastUsedFolder, RouteViewModel rou
             await saveRouteDialog.ShowDialog(CurrentWindow);
         }
 
-        public async Task<(PlannedRoute? PlannedRoute, string? RouteFilePath)> ShowOpenRouteDialog()
-        {
-            var openRouteDialog = Resolve<OpenRouteDialog>();
-
-            var viewModel = new OpenRouteDialogViewModel(
-                this,
-                Resolve<IUserPreferences>(),
-                Resolve<IRouteStore>());
-
-            openRouteDialog.DataContext = viewModel;
-
-            await openRouteDialog.ShowDialog(CurrentWindow);
-
-            return openRouteDialog.DialogResult == DialogResult.Ok
-                ? (viewModel.SelectedRoute?.PlannedRoute, viewModel.RouteFilePath)
-                : (null, null);
-        }
-
         public async Task<MessageBoxResult> ShowQuestionDialog(string title, string message)
         {
             return await MessageBox.ShowAsync(