فهرست منبع

Added Version Info to PRSAvalonia Settings Page
Minor Layout fixes to PRSAvalonia

frankvandenbos 2 ماه پیش
والد
کامیت
0cb455c16c

+ 1 - 0
PRS.Avalonia/PRS.Avalonia.Desktop/Program.cs

@@ -20,6 +20,7 @@ sealed class Program
         
         PlatformTools.Register<IPdfRenderer, Desktop_PdfRenderer>();
         PlatformTools.Register<IBluetooth, Desktop_Bluetooth>();
+        PlatformTools.Register<IAppVersion, Desktop_AppVersion>();
         
         return AppBuilder.Configure<App>()
             .UsePlatformDetect()

+ 2 - 2
PRS.Avalonia/PRS.Avalonia/App.axaml.cs

@@ -40,8 +40,8 @@ public class App : Application
             desktop.MainWindow = new MainWindow
             {
                 DataContext = new MainViewModel(),
-                Width = 400,
-                Height = 700,
+                Width = 450,
+                Height = 1000,
                 WindowStartupLocation = WindowStartupLocation.CenterScreen
             };
         }

+ 2 - 1
PRS.Avalonia/PRS.Avalonia/Components/ListView/PrsListView.axaml

@@ -58,7 +58,7 @@
             </ItemsControl.IsVisible>
         </ItemsControl>
 
-		<components:SearchBar Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
+		<components:SearchBar Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,2,0,0"
 							  Command="{Binding SearchCommand}"
 							  Text="{Binding SearchText}"
 							  IsVisible="{Binding SearchVisible}"/>
@@ -67,6 +67,7 @@
             Grid.Row="2"
             Grid.Column="0"
             Grid.ColumnSpan="2"
+            Margin="0,2,0,0"
             ItemTemplate="{Binding ItemTemplate}"
             ItemsSource="{Binding Repository.Items, FallbackValue={x:Null}}"
             >

+ 4 - 4
PRS.Avalonia/PRS.Avalonia/HomePage/HomePageView.axaml

@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:viewModels="clr-namespace:PRS.Avalonia.Modules"
              xmlns:moduleGrid="clr-namespace:InABox.Avalonia.Components.ModuleGrid;assembly=InABox.Avalonia"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             mc:Ignorable="d" d:DesignWidth="450" d:DesignHeight="1000"
              x:Class="PRS.Avalonia.Modules.HomePageView"
              x:DataType="viewModels:HomePageViewModel">
     <Grid>
@@ -69,12 +69,12 @@
             IsVisible="{Binding ClockOnVisible}" />
 
 		<ScrollViewer Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2"
-					  Margin="0" Padding="0">
+					  Margin="0">
 			<moduleGrid:AvaloniaModuleGrid
-				Margin="0"
+				Margin="{StaticResource PrsControlSpacing}"
 				Padding="0"
 				BorderThickness="0"
-				Modules="{Binding Modules}" />
+				Modules="{Binding Modules}"/>
 		</ScrollViewer>
 
     </Grid>

+ 17 - 1
PRS.Avalonia/PRS.Avalonia/Settings/SettingsView.axaml

@@ -12,6 +12,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <Grid.ColumnDefinitions>
@@ -139,7 +140,22 @@
             HorizontalAlignment="Stretch"
             VerticalContentAlignment="Center"
             Text="{Binding Password}" />
+        
+        <Label
+            Grid.Row="4"
+            Grid.Column="0"
+            VerticalContentAlignment="Center"
+            Content="Version" />
 
-
+        <TextBox
+            Grid.Row="4"
+            Grid.Column="1"
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Stretch"
+            VerticalContentAlignment="Center"
+            IsEnabled="False"
+            IsReadOnly="True"
+            Text="{Binding Version}" />
+        
     </Grid>
 </UserControl>

+ 4 - 0
PRS.Avalonia/PRS.Avalonia/Settings/SettingsViewModel.cs

@@ -6,6 +6,7 @@ using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using InABox.Avalonia;
 using InABox.Avalonia.Components;
+using InABox.Avalonia.Platform;
 using InABox.Core;
 using PRS.Avalonia.Components;
 using PRS.Avalonia.Login;
@@ -34,6 +35,8 @@ public partial class SettingsViewModel : ViewModelBase
 
     [ObservableProperty] private string _userID;
 
+    [ObservableProperty] private string _version;
+
 
     public SettingsViewModel()
     {
@@ -41,6 +44,7 @@ public partial class SettingsViewModel : ViewModelBase
 
         LoadProfile();
 
+        Version = PlatformTools.AppVersion.InstalledVersionNumber();
         
         ContextMenu = new AvaloniaMenuItem(Images.lines, () =>
         {