improve ui

This commit is contained in:
2024-09-23 22:40:18 +02:00
parent 782965ce49
commit 3f620cd963
9 changed files with 95 additions and 43 deletions

View File

@ -13,10 +13,11 @@ public partial class BuColView : ReactiveUserControl<BuColViewModel>
{
public BuColView()
{
InitializeComponent();
this.WhenActivated(disposables =>
{
});
InitializeComponent();
}
}

View File

@ -4,6 +4,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:StarsAssistant.ViewModels"
xmlns:views="clr-namespace:StarsAssistant.Views"
xmlns:materialIcons="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="StarsAssistant.Views.MainWindow"
x:DataType="vm:MainWindowViewModel"
@ -18,16 +19,34 @@
<vm:MainWindowViewModel/>
</Design.DataContext>
<TabControl>
<TabItem Header="Stars Assistant">
<Grid ColumnDefinitions="Auto, *" RowDefinitions="Auto, Auto">
<Label Grid.Row="0" Grid.Column="0" Margin="0,5,5,5" Padding="3">Database Path:</Label>
<TextBlock x:Name="DbPath" Grid.Row="0" Grid.Column="1" Margin="0 5" Padding="3"/>
</Grid>
</TabItem>
<TabItem Header="BuCol">
<views:BuColView x:Name="BuColView"
DataContext="{Binding BuColViewModel}" />
</TabItem>
</TabControl>
<Grid ColumnDefinitions="64,*" RowDefinitions="*">
<StackPanel Grid.Column="0"
HorizontalAlignment="Center" VerticalAlignment="Top"
Margin="0" Spacing="12"
>
<materialIcons:MaterialIcon Kind="DeathStar" Width="48" Height="48" />
<Button Height="56" Width="56" x:Name="NewButton">
<materialIcons:MaterialIcon Kind="NewBox" Width="48" Height="48" />
</Button>
<Button Height="56" Width="56" x:Name="OpenButton">
<materialIcons:MaterialIcon Kind="OpenInApp" Width="48" Height="48" />
</Button>
</StackPanel>
<TabControl Grid.Column="1">
<TabItem Header="Stars Assistant">
<Grid ColumnDefinitions="Auto, *" RowDefinitions="Auto, Auto">
<Label Grid.Row="0" Grid.Column="0" Margin="0,5,5,5" Padding="3">Database Path:</Label>
<TextBlock x:Name="DbPath" Grid.Row="0" Grid.Column="1" Margin="0 5" Padding="3"/>
</Grid>
</TabItem>
<TabItem Header="BuCol">
<views:BuColView x:Name="BuColView"
DataContext="{Binding BuColViewModel}" />
</TabItem>
</TabControl>
</Grid>
</Window>

View File

@ -13,13 +13,19 @@ public partial class MainWindow : ReactiveWindow<MainWindowViewModel>
{
public MainWindow()
{
InitializeComponent();
this.WhenActivated(disposables =>
{
this.OneWayBind(ViewModel, vm => vm.DbPath, v => v.DbPath.Text)
.DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.NewCommand, v => v.NewButton)
.DisposeWith(disposables);
this.BindCommand(ViewModel, vm => vm.OpenCommand, v => v.OpenButton)
.DisposeWith(disposables);
});
InitializeComponent();
}
}