Skip to content

Commit 3c40dac

Browse files
TectorsTectors
committed
Explorer Work
1 parent d85f8ad commit 3c40dac

File tree

2 files changed

+13
-57
lines changed

2 files changed

+13
-57
lines changed

‎Source/vj0/Models/Files/TreeItem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ public IBrush GetItemBrush()
4949
"Plugins" => new SolidColorBrush(Color.Parse("#ff5959")),
5050
"Environments" => new SolidColorBrush(Color.Parse("#35fc46")),
5151
"Athena" => new SolidColorBrush(Color.Parse("#6500ff")),
52-
"Blueprints" or "Blueprint" => new SolidColorBrush(Color.Parse("#0059ff")),
52+
"Blueprints" or "Blueprint" => new SolidColorBrush(Color.Parse("#0ee1e8")),
5353
"TimeOfDay" or "TODM" => new SolidColorBrush(Color.Parse("#006eff")),
5454
"UI" => new SolidColorBrush(Color.Parse("#ffc400")),
5555
"Sounds" => new SolidColorBrush(Color.Parse("#ff3300")),
5656
"BRCosmetics" => new SolidColorBrush(Color.Parse("#6e6e6e")),
5757
"GameFeatures" => new SolidColorBrush(Color.Parse("#6e6e6e")),
5858
"Animation" => new SolidColorBrush(Color.Parse("#91ff00")),
59-
_ => new SolidColorBrush(Color.Parse("#0e91e8"))
59+
_ => new SolidColorBrush(Color.Parse("#0e98e8"))
6060
};
6161
}
6262

‎Source/vj0/Views/ExplorerView.axaml‎

Lines changed: 11 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:Explorer="clr-namespace:vj0.Models.Files"
88
xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
99
xmlns:framework="clr-namespace:vj0.Services.Framework"
10+
xmlns:fluent="clr-namespace:FluentIcons.Avalonia.Fluent;assembly=FluentIcons.Avalonia.Fluent"
1011

1112
x:Class="vj0.Views.ExplorerView"
1213
x:DataType="viewModels1:ExplorerViewModel"
@@ -25,36 +26,6 @@
2526
<RowDefinition Height="*"/>
2627
</Grid.RowDefinitions>
2728

28-
<Grid Grid.Row="0" Height="60" IsVisible="False">
29-
<Border
30-
BorderThickness="1 1 1 0"
31-
Background="#0d0d0d"
32-
ClipToBounds="True"
33-
Padding="15"
34-
Margin="5 0 5 -50"
35-
CornerRadius="8 10 0 0">
36-
<Border.BorderBrush>
37-
<LinearGradientBrush StartPoint="0%,0%" EndPoint="100%,100%">
38-
<GradientStop Color="#1e1e1f" Offset="0" />
39-
</LinearGradientBrush>
40-
</Border.BorderBrush>
41-
42-
<Grid>
43-
<StackPanel Opacity="0.75">
44-
<TextBlock FontSize="12">Vfs Mount Point</TextBlock>
45-
<TextBlock FontSize="12">Vfs Version</TextBlock>
46-
47-
<TextBlock FontSize="12">Offset</TextBlock>
48-
</StackPanel>
49-
50-
<StackPanel Opacity="1" HorizontalAlignment="Right" Background="#0d0d0d">
51-
<TextBlock FontSize="12" TextAlignment="Right" Text="{Binding SelectedItemMountPoint}"/>
52-
<TextBlock FontSize="12" TextAlignment="Right" Text="{Binding SelectedItemArchiveVersion}"/>
53-
</StackPanel>
54-
</Grid>
55-
</Border>
56-
</Grid>
57-
5829
<!-- Folders -->
5930
<Border
6031
Grid.Row="1"
@@ -79,7 +50,6 @@
7950
SelectionChanged="FileTree_OnSelectionChanged"
8051
Padding="15"
8152
ItemsSource="{Binding TreeViewCollection}">
82-
8353
<TreeView.ItemContainerTheme>
8454
<ControlTheme x:DataType="Explorer:TreeItem"
8555
TargetType="TreeViewItem"
@@ -96,19 +66,17 @@
9666
Grid.Column="0"
9767
VerticalAlignment="Center">
9868

99-
<Canvas Width="14"
100-
Height="14"
69+
<Canvas Width="16"
70+
Height="16"
10171
Margin="0 3 8 0"
10272
VerticalAlignment="Center"
10373
HorizontalAlignment="Center">
10474
<Path
10575
Data="M2.5,5.5 A1.5,1.5 0 0 1 4,4 H7.172 A1.5,1.5 0 0 1 8.232,4.44 L9.56,5.76 A1.5,1.5 0 0 0 10.62,6 H16 A1.5,1.5 0 0 1 17.5,7.5 V14.5 A1.5,1.5 0 0 1 16,16 H4 A1.5,1.5 0 0 1 2.5,14.5 V5.5 Z"
106-
Stroke="#ffffff"
107-
StrokeThickness="1"
10876
Fill="{Binding ItemBrush}"
109-
Width="14"
77+
Width="16"
11078
Stretch="Uniform"
111-
Height="14"/>
79+
Height="16"/>
11280
</Canvas>
11381

11482
<TextBlock
@@ -180,7 +148,7 @@
180148

181149
<Grid>
182150
<TextBlock IsVisible="{Binding !FilesInFolderView}" HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0.45">No files in folder</TextBlock>
183-
151+
184152
<ScrollViewer Margin="0 0 5 0" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
185153
<ListBox Margin="15" ItemsSource="{Binding FlatViewFiles}"
186154
SelectionMode="Multiple"
@@ -199,16 +167,8 @@
199167
<DataTemplate DataType="Explorer:FileTile">
200168
<StackPanel Spacing="5" Margin="25 0 0 0"
201169
Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
202-
<Canvas Width="14" Height="14" Margin="0 0 4 0" VerticalAlignment="Center" HorizontalAlignment="Center">
203-
<Path
204-
Data="M4,2 H10 L14,6 V14 A2,2 0 0 1 12,16 H4 A2,2 0 0 1 2,14 V4 A2,2 0 0 1 4,2 Z M10,2 V6 H14"
205-
Stroke="White"
206-
StrokeThickness="1"
207-
Fill="#0e91e8"
208-
Width="14"
209-
Height="14"
210-
Stretch="Uniform"/>
211-
</Canvas>
170+
<fluent:FluentIcon Icon="Document" IconVariant="Filled" Foreground="#0e98e8"/>
171+
212172
<TextBlock Text="{Binding NameWithoutExtension}"
213173
FontSize="14"
214174
VerticalAlignment="Center"
@@ -237,16 +197,12 @@
237197
</Border.BorderBrush>
238198

239199
<Grid>
240-
<StackPanel Opacity="0.75">
241-
<TextBlock FontSize="13">Vfs</TextBlock>
242-
<TextBlock FontSize="13">Mount Point</TextBlock>
243-
<TextBlock FontSize="13">Version</TextBlock>
200+
<StackPanel Opacity="0.8">
201+
<TextBlock FontSize="13">Scope</TextBlock>
244202
</StackPanel>
245203

246204
<StackPanel Opacity="1" HorizontalAlignment="Right" Background="#0a0a0a">
247205
<TextBlock FontSize="14" TextAlignment="Right" Text="{Binding SelectedItemArchive}"/>
248-
<TextBlock FontSize="14" TextAlignment="Right" Text="{Binding SelectedItemMountPoint}"/>
249-
<TextBlock FontSize="14" TextAlignment="Right" Text="{Binding SelectedItemArchiveVersion}"/>
250206
</StackPanel>
251207
</Grid>
252208
</Border>
@@ -270,7 +226,7 @@
270226
</Border.BorderBrush>
271227

272228
<Grid>
273-
<StackPanel Opacity="0.75">
229+
<StackPanel Opacity="0.8">
274230
<TextBlock FontSize="13">Offset</TextBlock>
275231
<TextBlock FontSize="13">Size</TextBlock>
276232
<TextBlock FontSize="13">Compression Method</TextBlock>

0 commit comments

Comments
 (0)