Merge branch 'main' into 'main' (91a2ab5a) · Commits · Eclipse Projects / SKyBT / Libraries

Common/Common.UI.UnitTest/Controls/01_NavigationFrameTests.cs

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		using System.Windows;
		using System.Windows.Controls;

		using Common.UI.Controls;
		using Common.UI.Controls.Navigation;
		using Common.UI.Interfaces;
		using Common.UI.Interfaces.Navigation;
		using Common.UI.Models;

Common/Common.UI.ViewTest/App.xaml

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		<ResourceDictionary Source="pack://application:,,,/Common.UI;component/Resources/EditorStyles.xaml" />
		<ResourceDictionary Source="pack://application:,,,/Common.UI;component/Resources/ToolTipStyle.xaml" />
		<ResourceDictionary Source="pack://application:,,,/Common.UI;component/Resources/ScrollBarStyle.xaml" />
		<ResourceDictionary Source="pack://application:,,,/Common.UI;component/Resources/NavigationStyles.xaml" />

		<ResourceDictionary Source="Resources/SKyBTButtonStyles.xaml"/>
		<ResourceDictionary Source="Resources/SKyBTCommonColors.xaml"/>

Common/Common.UI.ViewTest/App.xaml.cs

+2 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ public partial class App : Application
		#region Simpel controls

		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Theming/MainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/NavigationFrame/MainWindow.xaml", UriKind.Relative );
		this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/NavigationFrame/MainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Windows/TitleBarMainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Windows/SplashScreenMainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Windows/LoginMainWindow.xaml", UriKind.Relative );
		@@ -41,7 +41,7 @@ public partial class App : Application
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/LocalizedInput/LocalizedIdentifierInputWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Editors/RowBasedTextEditorMainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/Editors/IntelliSenseEditorMainWindow.xaml", UriKind.Relative );
		this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/ScrollBar/MarkerScrollBar_MainWindow.xaml", UriKind.Relative );
		//this.StartupUri = new Uri( "/Common.UI.ViewTest;component/Views/ScrollBar/MarkerScrollBar_MainWindow.xaml", UriKind.Relative );

		#endregion Simple controls

Common/Common.UI.ViewTest/ViewModels/NavigationFrame/MainWindowViewModel.cs

+12 −3

Original line number	Diff line number	Diff line
		@@ -26,13 +26,22 @@ public partial class MainWindowViewModel : ObservableObject, INavigatorViewModel
		#region Navigation

		[RelayCommand]
		public void Forwards() {
		NavigationExecutor.Forwards<MainWindowViewModel>( 1, TransitionType.SlideLeft );
		public void FadeBackwards() {
		NavigationExecutor.Backwards( this, transitionType: TransitionType.Fade );
		}
		[RelayCommand]
		public void FadeForwards() {
		this.Forwards( transitionType: TransitionType.Fade );
		}

		[RelayCommand]
		public void Backwards() {
		public void SlideBackwards() {
		this.Backwards( 2, TransitionType.SlideRight );
		}
		[RelayCommand]
		public void SlideForwards() {
		NavigationExecutor.Forwards<MainWindowViewModel>( 1, TransitionType.SlideLeft );
		}

		#endregion Navigation

Common/Common.UI.ViewTest/Views/NavigationFrame/MainWindow.xaml

+26 −19

Original line number	Diff line number	Diff line
		@@ -3,39 +3,46 @@
		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"
		xmlns:uiCntl="clr-namespace:Common.UI.Controls;assembly=Common.UI"
		xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
		xmlns:uiNav="clr-namespace:Common.UI.Controls.Navigation;assembly=Common.UI"
		xmlns:local="clr-namespace:Common.UI.ViewTest.Views.NavigationFrame"
		xmlns:viewModel="clr-namespace:Common.UI.ViewTest.ViewModels.NavigationFrame"
		mc:Ignorable="d"
		Title="MainWindow" Height="450" Width="800" WindowStartupLocation="CenterScreen" Topmost="True">
		Title="MainWindow" Height="500" Width="900" WindowStartupLocation="CenterScreen" Topmost="True">
		<Window.DataContext>
		<viewModel:MainWindowViewModel/>
		</Window.DataContext>

		<Grid>
		<Grid.RowDefinitions>
		<RowDefinition Height="30"/>
		<RowDefinition Height="48"/>
		<RowDefinition Height="*"/>
		</Grid.RowDefinitions>
		<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
		<Button Content="↑ Prev. from View" Padding="12,0,12,0"
		<materialDesign:Card Grid.Row="0" materialDesign:ElevationAssist.Elevation="Dp4" Margin="0,3">
		<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,1">
		<Button Content="Fade prev." Focusable="False" Padding="12,0,12,0" Margin="0,0,1,0"
		Command="{Binding FadeBackwardsCommand}" />
		<Button Content="Fade next" Focusable="False" Padding="12,0,12,0" Margin="1,0,12,0"
		Command="{Binding FadeForwardsCommand}" />
		<Button Content="↑ Prev. from View" Focusable="False" Padding="12,0,12,0" Margin="12,0,1,0"
		Click="BackwardsFromView_Click"/>
		<Button Content="Next from View ↓" Padding="12,0,12,0" Margin="0,0,12,0"
		<Button Content="Next from View ↓" Focusable="False" Padding="12,0,12,0" Margin="1,0,12,0"
		Click="FrowardsFromView_Click"/>
		<Button Content="← Prev. from ViewModel" Padding="12,0,12,0"
		Command="{Binding BackwardsCommand}" />
		<Button Content="Next from ViewModel →" Padding="12,0,12,0" Margin="0,0,12,0"
		Command="{Binding ForwardsCommand}"/>
		<Button Content="← Prev. from ViewModel" Focusable="False" Padding="12,0,12,0" Margin="12,0,1,0"
		Command="{Binding SlideBackwardsCommand}" />
		<Button Content="Next from ViewModel →" Focusable="False" Padding="12,0,12,0" Margin="1,0,0,0"
		Command="{Binding SlideForwardsCommand}"/>
		</StackPanel>
		<uiCntl:NavigationFrame x:Name="navFrame" Grid.Row="1"
		</materialDesign:Card>
		<uiNav:NavigationFrame x:Name="navFrame" Grid.Row="1"
		OutDuration="0.25" InDuration="0.5"
		StartView="NavigationFrame.UserControl2">
		<!--TransitionType="SlideLeft" InDuration="0.75" >-->
		<uiCntl:NavigationFrame.Views>
		<uiNav:NavigationFrame.Views>
		<local:UserControl1/>
		<local:UserControl2/>
		<local:UserControl3 x:Name="startView"/>
		</uiCntl:NavigationFrame.Views>
		</uiCntl:NavigationFrame>
		</uiNav:NavigationFrame.Views>
		</uiNav:NavigationFrame>
		</Grid>
		</Window>