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

Format xaml files (Remove extra spaces and lines) #1938

Merged
merged 4 commits into from Jul 29, 2019
Merged
Changes from 3 commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -95,7 +95,6 @@
</ScrollViewer>
</controls:GroupBox>
<controls:GroupBox Grid.Row="0" Grid.Column="0" Title="CoinJoin" Padding="5" Margin="0 5 5 0">

<Grid Grid.Row="0" Grid.Column="0" Classes="content">
<Grid.RowDefinitions>
<RowDefinition Height="150" />
@@ -143,7 +142,7 @@
<RowDefinition Height="*"></RowDefinition>
</Grid.RowDefinitions>
<DrawingPresenter Grid.Row="0" Drawing="{Binding Icon}" VerticalAlignment="Top" Height="100" Width="75" />
<TextBlock Margin ="0 5 0 0" Grid.Row="1" Text="{Binding ToolTip}" TextAlignment="Center" TextWrapping="Wrap" />
<TextBlock Margin="0 5 0 0" Grid.Row="1" Text="{Binding ToolTip}" TextAlignment="Center" TextWrapping="Wrap" />
</Grid>
</Button>
</controls:GroupBox>
@@ -23,7 +23,7 @@
</UserControl.Styles>
<i:Interaction.Behaviors>
<behaviors:ClearPropertyOnLostFocusBehavior TargetProperty="{Binding SelectedCoin}" />
<behaviors:CommandOnFirstVisible Command="{Binding InitList}" />
<behaviors:CommandOnFirstVisible Command="{Binding InitList}" />
</i:Interaction.Behaviors>
<Grid IsSharedSizeScope="True">
<DockPanel LastChildFill="True">
@@ -38,33 +38,29 @@
</Grid.ColumnDefinitions>
<TextBlock Text="" Width="0" />
<TextBlock Text="" Grid.Column="1" />

<controls:SortingArrow Grid.Column="2" Text="Status" Command="{Binding SortCommand}" SortDirection="{Binding StatusSortDirection}" />

<controls:SortingArrow Grid.Column="3" Text="Amount (BTC)" Command="{Binding SortCommand}" SortDirection="{Binding AmountSortDirection}" />

<controls:SortingArrow Grid.Column="4" Text="Privacy" Command="{Binding SortCommand}" SortDirection="{Binding PrivacySortDirection}" />

<controls:SortingArrow Grid.Column="5" Text="Clusters" Command="{Binding SortCommand}" SortDirection="{Binding ClustersSortDirection}" />
</Grid>
<StackPanel Margin="0 10 0 0" Spacing="10" DockPanel.Dock="Bottom" Orientation="Horizontal">
<CheckBox Content = "Select All" IsThreeState="True" IsChecked = "{Binding SelectAllCheckBoxState}" Command="{Binding SelectAllCheckBoxCommand}" />
<CheckBox Content = "Select All Private" IsThreeState="True" IsChecked = "{Binding SelectPrivateCheckBoxState}" Command="{Binding SelectPrivateCheckBoxCommand}" ToolTip.Tip="Coins that have acquired the privacy target." />
<CheckBox Content = "Select All Non-Private" IsThreeState="True" IsChecked = "{Binding SelectNonPrivateCheckBoxState}" Command="{Binding SelectNonPrivateCheckBoxCommand}" ToolTip.Tip="Coins that have not acquired the privacy target." />
<CheckBox Content="Select All" IsThreeState="True" IsChecked="{Binding SelectAllCheckBoxState}" Command="{Binding SelectAllCheckBoxCommand}" />
<CheckBox Content="Select All Private" IsThreeState="True" IsChecked="{Binding SelectPrivateCheckBoxState}" Command="{Binding SelectPrivateCheckBoxCommand}" ToolTip.Tip="Coins that have acquired the privacy target." />
<CheckBox Content="Select All Non-Private" IsThreeState="True" IsChecked="{Binding SelectNonPrivateCheckBoxState}" Command="{Binding SelectNonPrivateCheckBoxCommand}" ToolTip.Tip="Coins that have not acquired the privacy target." />
<StackPanel Spacing="10" DockPanel.Dock="Bottom" Orientation="Horizontal" IsVisible="{Binding IsAnyCoinSelected}">
<TextBlock Text = "|" />
<TextBlock Text = "Selected Amount:" />
<TextBlock Foreground="YellowGreen" Text = "{Binding SelectedAmount, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}}" />
<TextBlock Text = "BTC" />
<TextBlock Text ="Merging unmixed coins with mixed ones undo those mixes." Classes="warningMessage" IsVisible="{Binding LabelExposeCommonOwnershipWarning}" />
<TextBlock Text="|" />
<TextBlock Text="Selected Amount:" />
<TextBlock Foreground="YellowGreen" Text="{Binding SelectedAmount, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}}" />
<TextBlock Text="BTC" />
<TextBlock Text="Merging unmixed coins with mixed ones undo those mixes." Classes="warningMessage" IsVisible="{Binding LabelExposeCommonOwnershipWarning}" />
</StackPanel>
</StackPanel>
<controls:BusyIndicator IsBusy ="{Binding IsCoinListLoading}" Text="Loading...">
<controls:BusyIndicator IsBusy="{Binding IsCoinListLoading}" Text="Loading...">
<controls:ExtendedListBox Items="{Binding Coins}" VirtualizationMode="None" SelectedItem="{Binding Path=SelectedCoin, Mode=TwoWay}">
<controls:ExtendedListBox.ContextMenu>
<ContextMenu>
<!--Enqueuing needs password, TODO: jump to password box OR display pw box in context menu + send button-->
<MenuItem Command="{Binding EnqueueCoin}" IsVisible="false">
<MenuItem Command="{Binding EnqueueCoin}" IsVisible="false">
<MenuItem.Header>
<Grid>
<Grid.ColumnDefinitions>
@@ -78,44 +74,34 @@
</MenuItem>
<MenuItem Header="Dequeue from CoinJoin" Command="{Binding DequeueCoin}">
<MenuItem.Icon>
<Path HorizontalAlignment="Left"
Data="M3.24,7.51c-0.146,0.142-0.146,0.381,0,0.523l5.199,5.193c0.234,0.238,0.633,0.064,0.633-0.262v-2.634c0.105-0.007,0.212-0.011,0.321-0.011c2.373,0,4.302,1.91,4.302,4.258c0,0.957-0.33,1.809-1.008,2.602c-0.259,0.307,0.084,0.762,0.451,0.572c2.336-1.195,3.73-3.408,3.73-5.924c0-3.741-3.103-6.783-6.916-6.783c-0.307,0-0.615,0.028-0.881,0.063V2.575c0-0.327-0.398-0.5-0.633-0.261L3.24,7.51 M4.027,7.771l4.301-4.3v2.073c0,0.232,0.21,0.409,0.441,0.366c0.298-0.056,0.746-0.123,1.184-0.123c3.402,0,6.172,2.709,6.172,6.041c0,1.695-0.718,3.24-1.979,4.352c0.193-0.51,0.293-1.045,0.293-1.602c0-2.76-2.266-5-5.046-5c-0.256,0-0.528,0.018-0.747,0.05C8.465,9.653,8.328,9.81,8.328,9.995v2.074L4.027,7.771z" Fill="#22B14C"
Height="16" Width="16" Stretch="Fill" />
<Path HorizontalAlignment="Left" Data="M3.24,7.51c-0.146,0.142-0.146,0.381,0,0.523l5.199,5.193c0.234,0.238,0.633,0.064,0.633-0.262v-2.634c0.105-0.007,0.212-0.011,0.321-0.011c2.373,0,4.302,1.91,4.302,4.258c0,0.957-0.33,1.809-1.008,2.602c-0.259,0.307,0.084,0.762,0.451,0.572c2.336-1.195,3.73-3.408,3.73-5.924c0-3.741-3.103-6.783-6.916-6.783c-0.307,0-0.615,0.028-0.881,0.063V2.575c0-0.327-0.398-0.5-0.633-0.261L3.24,7.51 M4.027,7.771l4.301-4.3v2.073c0,0.232,0.21,0.409,0.441,0.366c0.298-0.056,0.746-0.123,1.184-0.123c3.402,0,6.172,2.709,6.172,6.041c0,1.695-0.718,3.24-1.979,4.352c0.193-0.51,0.293-1.045,0.293-1.602c0-2.76-2.266-5-5.046-5c-0.256,0-0.528,0.018-0.747,0.05C8.465,9.653,8.328,9.81,8.328,9.995v2.074L4.027,7.771z" Fill="#22B14C" Height="16" Width="16" Stretch="Fill" />
</MenuItem.Icon>
</MenuItem>
</ContextMenu>
</controls:ExtendedListBox.ContextMenu>
<controls:ExtendedListBox.ItemTemplate>
<DataTemplate>
<Grid>
<Expander Name="coinExpander" ExpandDirection="Down" Classes="coloredExpander" Background="{Binding ElementName=coinExpander, Path=IsExpanded, Converter={StaticResource CoinItemExpanderColorConverter}}">
<Expander Name="coinExpander" ExpandDirection="Down" Classes="coloredExpander" Background="{Binding ElementName=coinExpander, Path=IsExpanded, Converter={StaticResource CoinItemExpanderColorConverter}}">
<Grid HorizontalAlignment="Left" ColumnDefinitions="150, *" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" MaxWidth="800" Margin="35 10 0 25">
<TextBlock Text="Transaction Id:" Grid.Row="0" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding TransactionId}" Background="Transparent" Grid.Column="1" Grid.Row="0" />

<TextBlock Text="Output Index:" Grid.Row="1" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding OutputIndex}" Grid.Column="1" Grid.Row="1" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding OutputIndex}" Grid.Column="1" Grid.Row="1" />
<TextBlock Text="Label:" Grid.Row="2" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Label}" Grid.Column="1" Grid.Row="2" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Label}" Grid.Column="1" Grid.Row="2" />
<TextBlock Text="Address:" Grid.Row="3" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Address}" Grid.Column="1" Grid.Row="3" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Address}" Grid.Column="1" Grid.Row="3" />
<TextBlock Text="Confirmations:" Grid.Row="4" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Confirmations}" Grid.Column="1" Grid.Row="4" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding Confirmations}" Grid.Column="1" Grid.Row="4" />
<TextBlock Text="Anonymity Set:" Grid.Row="5" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding AnonymitySet}" Grid.Column="1" Grid.Row="5" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding AnonymitySet}" Grid.Column="1" Grid.Row="5" />
<TextBlock Text="Key Path:" Grid.Row="6" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding KeyPath}" Grid.Column="1" Grid.Row="6" />

<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding KeyPath}" Grid.Column="1" Grid.Row="6" />
<TextBlock Text="Public Key:" Grid.Row="7" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding PubKey}" Grid.Column="1" Grid.Row="7" />
<controls:ExtendedTextBox Classes="selectableTextBlock Transaparent" Text="{Binding PubKey}" Grid.Column="1" Grid.Row="7" />
</Grid>
</Expander>

<Grid Margin="30 0 0 0" VerticalAlignment="Top">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="30" />
@@ -125,19 +111,15 @@
<ColumnDefinition Width="100" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<CheckBox HorizontalContentAlignment="Left" IsChecked="{Binding IsSelected}" Background="{DynamicResource ThemeBackgroundBrush}" />
<Border Background="Transparent" IsVisible="{Binding Confirmed}" Grid.Column="1" ToolTip.Tip="{Binding Confirmations, StringFormat=\{0\} Confirmations}">
<Path HorizontalAlignment="Left" Data="F1 M 23.7501,33.25L 34.8334,44.3333L 52.2499,22.1668L 56.9999,26.9168L 34.8334,53.8333L 19.0001,38L 23.7501,33.25 Z" Fill="#22B14C" Height="16" Width="16" Stretch="Fill" />
<Path HorizontalAlignment="Left" Data="F1 M 23.7501,33.25L 34.8334,44.3333L 52.2499,22.1668L 56.9999,26.9168L 34.8334,53.8333L 19.0001,38L 23.7501,33.25 Z" Fill="#22B14C" Height="16" Width="16" Stretch="Fill" />
</Border>

<Border ToolTip.Tip="{Binding ToolTip}" Padding="1" Grid.Column="2" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" BorderBrush="{Binding Status, Converter={StaticResource CoinStatusBorderBrushConverter}}" HorizontalAlignment="Left" BorderThickness="1" CornerRadius="0,6,6,0">
<Border ToolTip.Tip="{Binding ToolTip}" Padding="1" Grid.Column="2" Background="{Binding Status, Converter={StaticResource CoinStatusColorConverter}}" BorderBrush="{Binding Status, Converter={StaticResource CoinStatusBorderBrushConverter}}" HorizontalAlignment="Left" BorderThickness="1" CornerRadius="0,6,6,0">
<TextBlock Text="{Binding Status, Converter={StaticResource CoinStatusStringConverter}, Mode=OneWay}" Foreground="{Binding Status, Converter={StaticResource CoinStatusForegroundConverter}}" />
</Border>
<TextBlock Grid.Column="3" Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" />
<Panel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center" Background="Transparent"
DataContext="{Binding AnonymitySet, Converter={StaticResource PrivacyLevelValueConverter}}"
ToolTip.Tip="{Binding ToolTip}">
<Panel Grid.Column="4" VerticalAlignment="Center" HorizontalAlignment="Center" Background="Transparent" DataContext="{Binding AnonymitySet, Converter={StaticResource PrivacyLevelValueConverter}}" ToolTip.Tip="{Binding ToolTip}">
<DrawingPresenter Drawing="{Binding Icon}" Height="16" Width="16" Margin="0 0 25 0" />
</Panel>
<controls:ExtendedTextBox Classes="selectableTextBlock" Background="Transparent" Grid.Column="5" Text="{Binding Clusters, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" />
@@ -11,7 +11,6 @@
<converters:MoneyBrushConverter x:Key="MoneyBrushConverter" />
<converters:LurkingWifeModeStringConverter x:Key="LurkingWifeModeStringConverter" />
</UserControl.Resources>

<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<Grid Classes="content">
<DockPanel LastChildFill="True">
@@ -38,13 +37,10 @@
<TextBlock Text="{Binding DateTime, ConverterParameter=11, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="1" />
<TextBlock Text="{Binding AmountBtc, ConverterParameter=8, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="2" Foreground="{Binding AmountBtc, Converter={StaticResource MoneyBrushConverter}}" />
<TextBlock IsVisible="{Binding !ClipboardNotificationVisible}" Text="{Binding TransactionId, ConverterParameter=50, Converter={StaticResource LurkingWifeModeStringConverter}, Mode=OneWay}" Grid.Column="3" />

<Grid IsVisible="{Binding ClipboardNotificationVisible}" Grid.Column="3">
<Grid Opacity="{Binding ClipboardNotificationOpacity}">
<Grid.Transitions>
<DoubleTransition Property="Opacity"
Easing="CircularEaseIn"
Duration="0:0:0.5" />
<DoubleTransition Property="Opacity" Easing="CircularEaseIn" Duration="0:0:0.5" />
</Grid.Transitions>
<TextBlock Text="Copied" Foreground="White" FontWeight="Bold" />
</Grid>
@@ -2,19 +2,16 @@
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"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
xmlns:controls="clr-namespace:WalletWasabi.Gui.Controls;assembly=WalletWasabi.Gui">
<controls:GroupBox Title="{Binding Title}" TextBlock.FontSize="30" Padding="20" Margin="10">
<DockPanel LastChildFill ="True">
<controls:NoparaPasswordBox DockPanel.Dock="Top" Margin="4 0 4 20" Password="{Binding MaskedPin}" Watermark="PIN" UseFloatingWatermark="True">
</controls:NoparaPasswordBox>
<DockPanel LastChildFill="True">
<controls:NoparaPasswordBox DockPanel.Dock="Top" Margin="4 0 4 20" Password="{Binding MaskedPin}" Watermark="PIN" UseFloatingWatermark="True"></controls:NoparaPasswordBox>
<StackPanel DockPanel.Dock="Bottom">
<Button Margin="4 20" Content ="Send PIN to Device" Command="{Binding SendPinCommand}" />
<Button Margin="4 20" Content="Send PIN to Device" Command="{Binding SendPinCommand}" />
<TextBlock Text="{Binding WarningMessage}" Classes="warningMessage" />
<TextBlock Text="{Binding SuccessMessage}" Classes="validationMessage" Foreground="Green" />
</StackPanel>

<Grid>
<Grid.Styles>
<Style Selector="Button">
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.