From 22ca9d7822aab0ad95d92546840c82cf8f1300fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= <kovacsadam07@outlook.hu>
Date: Tue, 5 Sep 2023 11:39:56 +0200
Subject: [PATCH] Fix Gui missing file size attribute

---
 .../FileTime.GuiApp.App/Views/ItemView.axaml  | 74 ++++++++++++-------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/ItemView.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/ItemView.axaml
index cc90140..2b737fd 100644
--- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/ItemView.axaml
+++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/ItemView.axaml
@@ -66,20 +66,38 @@
             </ItemsControl.ItemTemplate>
         </ItemsControl>
 
-        <Grid
+        <StackPanel
             Grid.Column="2"
-            IsVisible="{Binding ShowAttributes, ElementName=ItemRoot}">
-            <StackPanel
-                HorizontalAlignment="Right"
-                Orientation="Horizontal">
+            HorizontalAlignment="Right"
+            IsVisible="{Binding ShowAttributes, ElementName=ItemRoot}"
+            Orientation="Horizontal">
+            <TextBlock
+                Width="50"
+                Classes="SmallText"
+                IsVisible="{Binding Converter={StaticResource IsTypeConverter}, ConverterParameter={x:Type appcore:IElementViewModel}}"
+                Text="{Binding BaseItem.DisplayName, Converter={StaticResource GetFileExtensionConverter}}" />
+            <Grid IsVisible="{Binding Converter={StaticResource IsTypeConverter}, ConverterParameter={x:Type traits:ISizeProvider}}">
                 <TextBlock
-                    Width="50"
+                    Width="60"
+                    x:DataType="traits:ISizeProvider"
                     Classes="SmallText"
-                    IsVisible="{Binding Converter={StaticResource IsTypeConverter}, ConverterParameter={x:Type appcore:IElementViewModel}}"
-                    Text="{Binding BaseItem.DisplayName, Converter={StaticResource GetFileExtensionConverter}}" />
-                <Grid
-                    DataContext="{Binding BaseItem}"
-                    IsVisible="{Binding Converter={StaticResource IsTypeConverter}, ConverterParameter={x:Type traits:ISizeProvider}}">
+                    Text="{Binding Size.Value, Converter={StaticResource FormatSizeConverter}}"
+                    TextAlignment="Right" />
+            </Grid>
+            <Grid>
+                <Grid.IsVisible>
+                    <MultiBinding Converter="{x:Static BoolConverters.And}">
+                        <Binding
+                            Converter="{StaticResource IsNotTypeConverter}"
+                            ConverterParameter="{x:Type traits:ISizeProvider}" />
+                        <Binding
+                            Converter="{StaticResource IsTypeConverter}"
+                            ConverterParameter="{x:Type traits:ISizeProvider}"
+                            Path="BaseItem" />
+                    </MultiBinding>
+                </Grid.IsVisible>
+
+                <Grid DataContext="{Binding BaseItem}">
                     <TextBlock
                         Width="60"
                         x:DataType="traits:ISizeProvider"
@@ -87,24 +105,24 @@
                         Text="{Binding Size.Value, Converter={StaticResource FormatSizeConverter}}"
                         TextAlignment="Right" />
                 </Grid>
-                <TextBlock
-                    Width="95"
-                    Classes="SmallText"
-                    Text="{Binding ModifiedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter=yyyy-MM-dd}"
-                    TextAlignment="Right" />
-                <TextBlock
-                    Width="35"
-                    Classes="SmallText"
-                    Text="{Binding ModifiedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter=hh:mm}"
-                    TextAlignment="Right" />
-                <TextBlock
-                    Width="45"
-                    Classes="SmallText"
-                    Text="{Binding BaseItem.Attributes}"
-                    TextAlignment="Right" />
+            </Grid>
+            <TextBlock
+                Width="95"
+                Classes="SmallText"
+                Text="{Binding ModifiedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter=yyyy-MM-dd}"
+                TextAlignment="Right" />
+            <TextBlock
+                Width="35"
+                Classes="SmallText"
+                Text="{Binding ModifiedAt, Converter={StaticResource DateTimeConverter}, ConverterParameter=hh:mm}"
+                TextAlignment="Right" />
+            <TextBlock
+                Width="45"
+                Classes="SmallText"
+                Text="{Binding BaseItem.Attributes}"
+                TextAlignment="Right" />
 
-            </StackPanel>
+        </StackPanel>
 
-        </Grid>
     </Grid>
 </UserControl>
\ No newline at end of file