From 480e0b9b12f9e9a2df392ee16d03986e41841e56 Mon Sep 17 00:00:00 2001
From: Diogo Trindade <diogotr7@gmail.com>
Date: Fri, 16 Jun 2023 22:52:42 +0100
Subject: [PATCH] Clean up layout view

---
 .../Screens/Device/DevicePropertiesView.axaml |  2 +-
 .../Device/Tabs/DeviceLayoutTabView.axaml     | 81 ++++++++++---------
 .../Device/Tabs/DeviceLayoutTabView.axaml.cs  |  2 +
 .../Device/Tabs/DeviceLayoutTabViewModel.cs   |  8 ++
 4 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
index 54c9d496b..2d0bccd94 100644
--- a/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
+++ b/src/Artemis.UI/Screens/Device/DevicePropertiesView.axaml
@@ -70,6 +70,6 @@
 
         </Border>
 
-        <StackPanel Grid.Column="0" Grid.ColumnSpan="3" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+        <StackPanel Grid.Column="0" Grid.ColumnSpan="3" Classes="notification-container" Name="NotificationContainer" VerticalAlignment="Top" HorizontalAlignment="Right" />
     </Grid>
 </windowing:AppWindow>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
index c09794871..877afaaa4 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml
@@ -12,71 +12,78 @@
         <Border Classes="card" Margin="5">
             <Grid RowDefinitions="*,Auto">
                 <StackPanel Grid.Row="0">
-                    <TextBlock
-                        TextWrapping="Wrap"
-                        Text="The device layout is used to determine the position of LEDs and to create the visual representation of the device." />
-                    <Grid ColumnDefinitions="*,Auto" RowDefinitions="*,*,*,*,*" Margin="0, 20,0,0">
-                        <StackPanel Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,0,0,10" >
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="0" Grid.Column="0">
                             <TextBlock Text="Default layout file path" />
                             <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding DefaultLayoutPath}" />
                         </StackPanel>
-                        <Button
-                            Grid.Column="1"
-                            Grid.Row="0"
-                            Classes="icon-button"
-                            HorizontalAlignment="Right"
-                            ToolTip.Tip="Copy layout file path to clipboard"
-                            Click="LayoutPathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-
-                        <StackPanel Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2"  Margin="0,0,0,10">
+                        <StackPanel Grid.Row="0" Grid.Column="1" VerticalAlignment="Center">
+                            <Button
+                                Classes="icon-button"
+                                HorizontalAlignment="Right"
+                                ToolTip.Tip="Copy layout file path to clipboard"
+                                Click="LayoutPathButton_OnClick">
+                                <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Image file path" />
                             <TextBlock Classes="subtitle" FontSize="12" TextWrapping="Wrap" Text="{CompiledBinding Device.Layout.Image.LocalPath}" />
                         </StackPanel>
-                        <Button
-                            Grid.Column="1"
-                            Grid.Row="1"
-                            Classes="icon-button"
-                            HorizontalAlignment="Right"
-                            ToolTip.Tip="Copy image file path to clipboard"
-                            Click="ImagePathButton_OnClick">
-                            <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
-                        </Button>
-
-                        <StackPanel Grid.Column="0" Grid.Row="2" Margin="0,0,0,10">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
+                            <Button
+                                Classes="icon-button"
+                                HorizontalAlignment="Right"
+                                ToolTip.Tip="Copy image file path to clipboard"
+                                Click="ImagePathButton_OnClick">
+                                <avalonia:MaterialIcon Kind="ContentCopy" Width="18" Height="18" />
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Disable default layout" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="With this checked, Artemis will not load a layout for this device unless you specifically provide one." />
                         </StackPanel>
-                        <CheckBox Grid.Column="1" Grid.Row="2" HorizontalAlignment="Right" Margin="0,0,-10,0" />
-
-                        <StackPanel Grid.Column="0" Grid.Row="3" Margin="0,0,0,10">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center">
+                            <CheckBox HorizontalAlignment="Right" Margin="0,0,-10,0" />
+                        </StackPanel>
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Custom layout path" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="{CompiledBinding CustomLayoutPath}" />
                         </StackPanel>
-                        <StackPanel Grid.Column="1" Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
                             <Button Content="Clear" Command="{CompiledBinding ClearCustomLayout}" IsEnabled="{CompiledBinding HasCustomLayout}" />
                             <!-- 5 pixels of margin between the buttons -->
                             <Button Margin="5,0,0,0" Content="Browse" Command="{CompiledBinding BrowseCustomLayout}" />
                         </StackPanel>
-
-                        <StackPanel Grid.Column="0" Grid.Row="4" Margin="0,0,0,10">
+                    </Grid>
+                    <Border Classes="card-separator" />
+                    <Grid RowDefinitions="*,*" ColumnDefinitions="*,Auto">
+                        <StackPanel Grid.Row="1" Grid.Column="0">
                             <TextBlock Text="Export current layout" />
                             <TextBlock Classes="subtitle" FontSize="12" Text="If there is a layout used, export that. Otherwise, export the LEDs present." />
                         </StackPanel>
-                        <Button Grid.Column="1" Grid.Row="4" Margin="0,0,0,0" HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
+                        <StackPanel Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Orientation="Horizontal">
+                            <Button HorizontalAlignment="Right" Content="Export" Command="{CompiledBinding ExportLayout}" />
+                        </StackPanel>
                     </Grid>
                 </StackPanel>
                 <controls:HyperlinkButton
+                    Grid.Row="1"
                     Content="Learn more about layouts on the wiki"
                     NavigateUri="https://wiki.artemis-rgb.com/en/guides/developer/layouts"
-                    Grid.Row="1"
                     Margin="0 20"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Bottom" />
             </Grid>
-
         </Border>
-
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
index 4ce6a72a5..3394a92bb 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabView.axaml.cs
@@ -17,10 +17,12 @@ public partial class DeviceLayoutTabView : ReactiveUserControl<DeviceLayoutTabVi
     private void LayoutPathButton_OnClick(object? sender, RoutedEventArgs e)
     {
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.DefaultLayoutPath);
+        ViewModel.ShowCopiedNotification();
     }
 
     private void ImagePathButton_OnClick(object? sender, RoutedEventArgs e)
     {
         TopLevel.GetTopLevel(this).Clipboard.SetTextAsync(ViewModel.Device.Layout.Image.LocalPath);
+        ViewModel.ShowCopiedNotification();
     }
 }
\ No newline at end of file
diff --git a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
index b6370dd9d..823a4cc86 100644
--- a/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
+++ b/src/Artemis.UI/Screens/Device/Tabs/DeviceLayoutTabViewModel.cs
@@ -140,4 +140,12 @@ public class DeviceLayoutTabViewModel : ActivatableViewModelBase
             .WithSeverity(NotificationSeverity.Success)
             .Show();
     }
+
+    public void ShowCopiedNotification()
+    {
+        _notificationService.CreateNotification()
+            .WithTitle("Copied!")
+            .WithSeverity(NotificationSeverity.Informational)
+            .Show();
+    }
 }
\ No newline at end of file