Remove DataGrid and DataBox
MODIFY
WalletWasabi.Fluent.Desktop/packages.lock.json
WalletWasabi.Fluent.Desktop/packages.lock.json
"Avalonia": "0.10.12"
}
},
- "DataBox": {
- "type": "Transitive",
- "resolved": "0.10.11.1",
- "contentHash": "cEAKQ6gEDLY8NVHl8HX6cZUpk+SVZyvozxK9KaXhmU+I0jg62E0FecXK/p768lPUpyCqsD0aX2NtzDpgaVV7Mg==",
- "dependencies": {
- "Avalonia": "0.10.11"
- }
- },
"DynamicData": {
"type": "Transitive",
"resolved": "7.1.1",
"type": "Project",
"dependencies": {
"Avalonia": "0.10.12",
- "Avalonia.Controls.DataGrid": "0.10.12",
"Avalonia.Controls.TreeDataGrid": "0.10.10-cibuild0018875-beta",
"Avalonia.Diagnostics": "0.10.12",
"Avalonia.ReactiveUI": "0.10.12",
"Avalonia.Xaml.Behaviors": "0.10.12.2",
- "DataBox": "0.10.11.1",
"System.Drawing.Common": "6.0.0",
"System.Reactive": "5.0.0",
"System.Runtime": "4.3.1",

DELETE
WalletWasabi.Fluent/Behaviors/HideDataGridColumnBehavior.cs
-using System.Linq;
-using System.Reactive.Disposables;
-using Avalonia;
-using Avalonia.Controls;
-using ReactiveUI;
-
-namespace WalletWasabi.Fluent.Behaviors;
-
-public class HideDataGridColumnBehavior : DisposingBehavior<DataGrid>
-{
- public static readonly StyledProperty<double> HideThresholdWidthProperty =
- AvaloniaProperty.Register<HideDataGridColumnBehavior, double>(nameof(HideThresholdWidth));
-
- public static readonly StyledProperty<string> ColumnHeaderProperty =
- AvaloniaProperty.Register<HideDataGridColumnBehavior, string>(nameof(ColumnHeader));
-
- public double HideThresholdWidth
- {
- get => GetValue(HideThresholdWidthProperty);
- set => SetValue(HideThresholdWidthProperty, value);
- }
-
- public string ColumnHeader
- {
- get => GetValue(ColumnHeaderProperty);
- set => SetValue(ColumnHeaderProperty, value);
- }
-
- protected override void OnAttached(CompositeDisposable disposables)
- {
- AssociatedObject?
- .WhenAnyValue(x => x.Bounds.Width)
- .Subscribe(width =>
- {
- var column = AssociatedObject.Columns.FirstOrDefault(x => ReferenceEquals(x.Header, ColumnHeader));
-
- if (column is { })
- {
- column.IsVisible = width > HideThresholdWidth;
- }
- })
- .DisposeWith(disposables);
- }
-}

DELETE
WalletWasabi.Fluent/Styles/DataBox.axaml
-<Styles xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
- <Style Selector="DataBox">
- <Setter Property="GridLinesVisibility" Value="Horizontal"/>
- <Setter Property="IsReadOnly" Value="True"/>
- <Setter Property="CanUserResizeColumns" Value="True"/>
- </Style>
-
- <Style Selector="DataBoxRow">
- <Setter Property="Focusable" Value="False" />
- <Setter Property="Template">
- <ControlTemplate>
- <DockPanel LastChildFill="True">
- <Border Name="PART_SelectionIndicator"
- BorderThickness="2 0 0 0"
- DockPanel.Dock="Left"
- VerticalAlignment="Stretch" />
- <Grid Name="PART_Root"
- RowDefinitions="*,Auto,Auto"
- ColumnDefinitions="Auto,*">
- <Rectangle Name="BackgroundRectangle"
- Grid.RowSpan="2"
- Grid.ColumnSpan="2" />
- <DataBoxCellsPresenter Name="PART_CellsPresenter"
- Grid.Column="1" />
- <Rectangle Name="PART_BottomGridLine"
- Grid.Row="2"
- Grid.Column="1"
- HorizontalAlignment="Stretch"
- Height="1" />
- </Grid>
- </DockPanel>
- </ControlTemplate>
- </Setter>
- </Style>
-
- <Style Selector="DataBoxRow:pointerover /template/ Rectangle#BackgroundRectangle">
- <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
- </Style>
- <Style Selector="DataBoxRow:selected /template/ Border#PART_SelectionIndicator">
- <Setter Property="BorderBrush" Value="{DynamicResource DataGridRowIndicatorBrush}" />
- </Style>
- <Style Selector="DataBoxRow /template/ Border#PART_SelectionIndicator">
- <Setter Property="BorderBrush" Value="Transparent" />
- </Style>
-
- <Style Selector="DataBoxCell">
- <Setter Property="Padding" Value="0"/>
- </Style>
-
- <Style Selector="DataBoxColumnHeader">
- <Setter Property="FontSize" Value="{StaticResource FontSizeH7}" />
- <Setter Property="FontWeight" Value="Bold" />
- <Setter Property="Padding" Value="12 10 10 10" />
- </Style>
-</Styles>

DELETE
WalletWasabi.Fluent/Styles/DataGrid.axaml
-<Styles xmlns="https://github.com/avaloniaui"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
- <Style Selector="DataGrid">
- <Setter Property="GridLinesVisibility" Value="Horizontal"/>
- <Setter Property="IsReadOnly" Value="True"/>
- <Setter Property="CanUserResizeColumns" Value="True"/>
- </Style>
-
- <Style Selector="DataGridRow">
- <Setter Property="Focusable" Value="False" />
- <Setter Property="Template">
- <ControlTemplate>
- <DockPanel LastChildFill="True">
- <Border Name="PART_SelectionIndicator"
- BorderThickness="2 0 0 0"
- DockPanel.Dock="Left"
- VerticalAlignment="Stretch" />
- <DataGridFrozenGrid Name="PART_Root"
- RowDefinitions="*,Auto,Auto"
- ColumnDefinitions="Auto,*">
-
- <Rectangle Name="BackgroundRectangle"
- Grid.RowSpan="2"
- Grid.ColumnSpan="2" />
- <Rectangle x:Name="InvalidVisualElement"
- Grid.ColumnSpan="2"
- Fill="{DynamicResource DataGridRowInvalidBrush}" />
-
- <DataGridRowHeader Name="PART_RowHeader"
- Grid.RowSpan="3"
- DataGridFrozenGrid.IsFrozen="True" />
- <DataGridCellsPresenter Name="PART_CellsPresenter"
- Grid.Column="1"
- DataGridFrozenGrid.IsFrozen="True" />
- <DataGridDetailsPresenter Name="PART_DetailsPresenter"
- Grid.Row="1"
- Grid.Column="1"
- Background="{DynamicResource DataGridDetailsPresenterBackgroundBrush}" />
- <Rectangle Name="PART_BottomGridLine"
- Grid.Row="2"
- Grid.Column="1"
- HorizontalAlignment="Stretch"
- Height="1" />
-
- </DataGridFrozenGrid>
- </DockPanel>
- </ControlTemplate>
- </Setter>
- </Style>
-
- <Style Selector="DataGridRow:pointerover /template/ Rectangle#BackgroundRectangle">
- <Setter Property="Fill" Value="{DynamicResource DataGridRowSelectedBackgroundColor}" />
- </Style>
- <Style Selector="DataGridRow:selected /template/ Border#PART_SelectionIndicator">
- <Setter Property="BorderBrush" Value="{DynamicResource DataGridRowIndicatorBrush}" />
- </Style>
- <Style Selector="DataGridRow /template/ Border#PART_SelectionIndicator">
- <Setter Property="BorderBrush" Value="Transparent" />
- </Style>
-
- <Style Selector="DataGridCell">
- <Setter Property="Padding" Value="0"/>
- </Style>
-
- <Style Selector="DataGridColumnHeader">
- <Setter Property="FontSize" Value="{StaticResource FontSizeH7}" />
- <Setter Property="FontWeight" Value="Bold" />
- <Setter Property="Padding" Value="12 10 10 10" />
- </Style>
-</Styles>

MODIFY
WalletWasabi.Fluent/Styles/Styles.axaml
WalletWasabi.Fluent/Styles/Styles.axaml
<StyleInclude Source="avares://WalletWasabi.Fluent/Controls/AnimatedButton.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Controls/CurrencyEntryBox.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Controls/HistoryPlaceholderPanel.axaml" />
- <StyleInclude Source="avares://WalletWasabi.Fluent/Styles/DataGrid.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/TreeDataGrid.axaml" />
- <StyleInclude Source="avares://WalletWasabi.Fluent/Styles/DataBox.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/RadioButton.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/SettingsLayout.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/Slider.axaml" />

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseDark.axaml
WalletWasabi.Fluent/Styles/Themes/BaseDark.axaml
<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentDark.xaml" />
<!-- Needs to be here because of dependency reason -->
- <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
- <StyleInclude Source="avares://DataBox/Themes/Fluent.axaml" />
<StyleInclude Source="avares://Avalonia.Xaml.Interactions/Draggable/Styles.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/Themes/Base.axaml" />

MODIFY
WalletWasabi.Fluent/Styles/Themes/BaseLight.axaml
WalletWasabi.Fluent/Styles/Themes/BaseLight.axaml
<StyleInclude Source="avares://Avalonia.Themes.Fluent/FluentLight.xaml" />
<!-- Needs to be here because of dependency reason -->
- <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml" />
<StyleInclude Source="avares://Avalonia.Controls.TreeDataGrid/Themes/Fluent.axaml"/>
- <StyleInclude Source="avares://DataBox/Themes/Fluent.axaml" />
<StyleInclude Source="avares://Avalonia.Xaml.Interactions/Draggable/Styles.axaml" />
<StyleInclude Source="avares://WalletWasabi.Fluent/Styles/Themes/Base.axaml" />

MODIFY
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
WalletWasabi.Fluent/WalletWasabi.Fluent.csproj
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="0.10.10-cibuild0018875-beta" />
<PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
- <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.12.2" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
- <PackageReference Include="DataBox" Version="0.10.11.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\WalletWasabi\WalletWasabi.csproj" />

MODIFY
WalletWasabi.Fluent/packages.lock.json
WalletWasabi.Fluent/packages.lock.json
"System.ValueTuple": "4.5.0"
}
},
- "Avalonia.Controls.DataGrid": {
- "type": "Direct",
- "requested": "[0.10.12, )",
- "resolved": "0.10.12",
- "contentHash": "i3zM3P8PUY4FNhATZoFWkto3H66FcIrnJNMyOsl1fN0FPS6meysAwCKQwuou/oapyzZEODeAmCVdqB0AgjNHVw==",
- "dependencies": {
- "Avalonia": "0.10.12",
- "Avalonia.Remote.Protocol": "0.10.12",
- "JetBrains.Annotations": "10.3.0",
- "System.Reactive": "5.0.0"
- }
- },
"Avalonia.Controls.TreeDataGrid": {
"type": "Direct",
"requested": "[0.10.10-cibuild0018875-beta, )",
"Avalonia.Xaml.Interactivity": "0.10.12.2"
}
},
- "DataBox": {
- "type": "Direct",
- "requested": "[0.10.11.1, )",
- "resolved": "0.10.11.1",
- "contentHash": "cEAKQ6gEDLY8NVHl8HX6cZUpk+SVZyvozxK9KaXhmU+I0jg62E0FecXK/p768lPUpyCqsD0aX2NtzDpgaVV7Mg==",
- "dependencies": {
- "Avalonia": "0.10.11"
- }
- },
"System.Drawing.Common": {
"type": "Direct",
"requested": "[6.0.0, )",
"Microsoft.NETCore.Targets": "1.1.3"
}
},
+ "Avalonia.Controls.DataGrid": {
+ "type": "Transitive",
+ "resolved": "0.10.12",
+ "contentHash": "i3zM3P8PUY4FNhATZoFWkto3H66FcIrnJNMyOsl1fN0FPS6meysAwCKQwuou/oapyzZEODeAmCVdqB0AgjNHVw==",
+ "dependencies": {
+ "Avalonia": "0.10.12",
+ "Avalonia.Remote.Protocol": "0.10.12",
+ "JetBrains.Annotations": "10.3.0",
+ "System.Reactive": "5.0.0"
+ }
+ },
"Avalonia.Remote.Protocol": {
"type": "Transitive",
"resolved": "0.10.12",

Remove DataGrid and DataBox