Remove crashing animation

LaurentTreguier · LaurentTreguier · commit ca8978853844 · 2026-03-15T11:50:48.000+01:00
diff --git a/Fyreplace/Views/Pages/AccountEntryPageBase.cs b/Fyreplace/Views/Pages/AccountEntryPageBase.cs
@@ -10,41 +10,13 @@ namespace Fyreplace.Views.Pages
 {
     public abstract class AccountEntryPageBase<VM> : Page where VM : AccountEntryViewModelBase
     {
-        protected abstract IDictionary<string, UIElement> ConnectedElements { get; }
-
-        protected abstract VM viewModel { get; }
-
-        protected override void OnNavigatedTo(NavigationEventArgs e)
-        {
-            base.OnNavigatedTo(e);
-
-            var animator = ConnectedAnimationService.GetForCurrentView();
-
-            foreach (var entry in ConnectedElements)
-            {
-                animator.GetAnimation(entry.Key)?.TryStart(entry.Value);
-            }
-        }
-
-        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
-        {
-            var animator = ConnectedAnimationService.GetForCurrentView();
-
-            foreach (var entry in ConnectedElements)
-            {
-                animator
-                    .PrepareToAnimate(entry.Key, entry.Value)
-                    .Configuration = new DirectConnectedAnimationConfiguration();
-            }
-
-            base.OnNavigatingFrom(e);
-        }
+        protected abstract VM ViewModel { get; }
 
         protected void Accelerators_Submit(KeyboardAccelerator sender, KeyboardAcceleratorInvokedEventArgs args)
         {
-            if (viewModel.CanSubmit)
+            if (ViewModel.CanSubmit)
             {
-                viewModel.SubmitAsync();
+                ViewModel.SubmitAsync();
             }
         }
     }
diff --git a/Fyreplace/Views/Pages/LoginPage.xaml b/Fyreplace/Views/Pages/LoginPage.xaml
@@ -28,8 +28,8 @@
         <ComboBox
             x:Uid="AccountEntryPageBase_Environment"
             HorizontalAlignment="Stretch"
-            ItemsSource="{x:Bind viewModel.EnvironmentNames}"
-            SelectedIndex="{x:Bind viewModel.SelectedEnvironmentIndex, Mode=TwoWay}"
+            ItemsSource="{x:Bind ViewModel.EnvironmentNames}"
+            SelectedIndex="{x:Bind ViewModel.SelectedEnvironmentIndex, Mode=TwoWay}"
             IsEnabled="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
         <TextBox
             x:Name="Identifier"
@@ -43,7 +43,7 @@
         <TextBox
             x:Name="RandomCode"
             x:Uid="AccountEntryPageBase_RandomCode"
-            Text="{x:Bind viewModel.RandomCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            Text="{x:Bind ViewModel.RandomCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Visibility="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
             <TextBox.KeyboardAccelerators>
                 <KeyboardAccelerator Key="Enter" Invoked="Accelerators_Submit" />
@@ -58,21 +58,21 @@
                 x:Uid="LoginPage_Submit"
                 HorizontalAlignment="Stretch"
                 Style="{ThemeResource AccentButtonStyle}"
-                Command="{x:Bind viewModel.SubmitCommand}" />
+                Command="{x:Bind ViewModel.SubmitCommand}" />
             <ProgressBar
                 VerticalAlignment="Top"
                 IsIndeterminate="True"
-                Visibility="{x:Bind viewModel.IsLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                Visibility="{x:Bind ViewModel.IsLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             <TeachingTip
                 x:Uid="AccountEntryPageBase_RandomCodeTip"
                 PreferredPlacement="BottomRight"
                 IconSource="{ui:FontIconSource Glyph=&#xE715;}"
-                IsOpen="{x:Bind viewModel.IsRandomCodeTipShown, Mode=TwoWay}" />
+                IsOpen="{x:Bind ViewModel.IsRandomCodeTipShown, Mode=TwoWay}" />
         </Grid>
         <Button
             x:Uid="AccountEntryPageBase_Cancel"
             HorizontalAlignment="Stretch"
             Visibility="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-            Command="{x:Bind viewModel.CancelCommand}" />
+            Command="{x:Bind ViewModel.CancelCommand}" />
     </StackPanel>
 </local:LoginPageBase>
diff --git a/Fyreplace/Views/Pages/LoginPage.xaml.cs b/Fyreplace/Views/Pages/LoginPage.xaml.cs
@@ -11,20 +11,15 @@ public abstract class LoginPageBase : AccountEntryPageBase<LoginViewModel>
 
     public sealed partial class LoginPage : LoginPageBase
     {
-        protected override IDictionary<string, UIElement> ConnectedElements => new Dictionary<string, UIElement>
-        {
-            ["title"] = Title,
-            ["first-field"] = Identifier
-        };
-        protected override LoginViewModel viewModel => AppBase.GetService<LoginViewModel>();
+        protected override LoginViewModel ViewModel => AppBase.GetService<LoginViewModel>();
 
         private readonly IPreferences preferences = AppBase.GetService<IPreferences>();
 
         public LoginPage() => InitializeComponent();
 
         private void Form_Loaded(object sender, RoutedEventArgs e)
         {
-            if (!viewModel.CanSubmitFirstStep)
+            if (!ViewModel.CanSubmitFirstStep)
             {
                 Identifier.Focus(FocusState.Programmatic);
             }
diff --git a/Fyreplace/Views/Pages/RegisterPage.xaml b/Fyreplace/Views/Pages/RegisterPage.xaml
@@ -28,8 +28,8 @@
         <ComboBox
             x:Uid="AccountEntryPageBase_Environment"
             HorizontalAlignment="Stretch"
-            ItemsSource="{x:Bind viewModel.EnvironmentNames}"
-            SelectedIndex="{x:Bind viewModel.SelectedEnvironmentIndex, Mode=TwoWay}"
+            ItemsSource="{x:Bind ViewModel.EnvironmentNames}"
+            SelectedIndex="{x:Bind ViewModel.SelectedEnvironmentIndex, Mode=TwoWay}"
             IsEnabled="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
         <TextBox
             x:Name="Username"
@@ -52,15 +52,15 @@
         <TextBox
             x:Name="RandomCode"
             x:Uid="AccountEntryPageBase_RandomCode"
-            Text="{x:Bind viewModel.RandomCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+            Text="{x:Bind ViewModel.RandomCode, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
             Visibility="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
             <TextBox.KeyboardAccelerators>
                 <KeyboardAccelerator Key="Enter" Invoked="Accelerators_Submit" />
             </TextBox.KeyboardAccelerators>
         </TextBox>
         <CheckBox
             x:Uid="RegisterPage_Terms"
-            IsChecked="{x:Bind viewModel.HasAcceptedTerms, Mode=TwoWay}"
+            IsChecked="{x:Bind ViewModel.HasAcceptedTerms, Mode=TwoWay}"
             IsEnabled="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}" />
         <Grid>
             <Grid.ColumnDefinitions>
@@ -85,21 +85,21 @@
                 x:Uid="RegisterPage_Submit"
                 HorizontalAlignment="Stretch"
                 Style="{ThemeResource AccentButtonStyle}"
-                Command="{x:Bind viewModel.SubmitCommand}" />
+                Command="{x:Bind ViewModel.SubmitCommand}" />
             <ProgressBar
                 VerticalAlignment="Top"
                 IsIndeterminate="True"
-                Visibility="{x:Bind viewModel.IsLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
+                Visibility="{x:Bind ViewModel.IsLoading, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" />
             <TeachingTip
                 x:Uid="AccountEntryPageBase_RandomCodeTip"
                 PreferredPlacement="BottomRight"
                 IconSource="{ui:FontIconSource Glyph=&#xE715;}"
-                IsOpen="{x:Bind viewModel.IsRandomCodeTipShown, Mode=TwoWay}" />
+                IsOpen="{x:Bind ViewModel.IsRandomCodeTipShown, Mode=TwoWay}" />
         </Grid>
         <Button
             x:Uid="AccountEntryPageBase_Cancel"
             HorizontalAlignment="Stretch"
             Visibility="{x:Bind preferences.Account_IsWaitingForRandomCode, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
-            Command="{x:Bind viewModel.CancelCommand}" />
+            Command="{x:Bind ViewModel.CancelCommand}" />
     </StackPanel>
 </local:RegisterPageBase>
diff --git a/Fyreplace/Views/Pages/RegisterPage.xaml.cs b/Fyreplace/Views/Pages/RegisterPage.xaml.cs
@@ -11,24 +11,19 @@ public abstract class RegisterPageBase : AccountEntryPageBase<RegisterViewModel>
 
     public sealed partial class RegisterPage : RegisterPageBase
     {
-        protected override IDictionary<string, UIElement> ConnectedElements => new Dictionary<string, UIElement>
-        {
-            ["title"] = Title,
-            ["first-field"] = Username
-        };
-        protected override RegisterViewModel viewModel => AppBase.GetService<RegisterViewModel>();
+        protected override RegisterViewModel ViewModel => AppBase.GetService<RegisterViewModel>();
 
         private readonly IPreferences preferences = AppBase.GetService<IPreferences>();
 
         public RegisterPage() => InitializeComponent();
 
         private void Form_Loaded(object sender, RoutedEventArgs e)
         {
-            if (!viewModel.IsUsernameValid)
+            if (!ViewModel.IsUsernameValid)
             {
                 Username.Focus(FocusState.Programmatic);
             }
-            else if (!viewModel.IsEmailValid)
+            else if (!ViewModel.IsEmailValid)
             {
                 Email.Focus(FocusState.Programmatic);
             }

Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,15 @@ public abstract class LoginPageBase : AccountEntryPageBase<LoginViewModel>`
`11`	`11`
`12`	`12`	`public sealed partial class LoginPage : LoginPageBase`
`13`	`13`	`{`
`14`		`- protected override IDictionary<string, UIElement> ConnectedElements => new Dictionary<string, UIElement>`
`15`		`- {`
`16`		`- ["title"] = Title,`
`17`		`- ["first-field"] = Identifier`
`18`		`- };`
`19`		`- protected override LoginViewModel viewModel => AppBase.GetService<LoginViewModel>();`
	`14`	`+ protected override LoginViewModel ViewModel => AppBase.GetService<LoginViewModel>();`
`20`	`15`
`21`	`16`	`private readonly IPreferences preferences = AppBase.GetService<IPreferences>();`
`22`	`17`
`23`	`18`	`public LoginPage() => InitializeComponent();`
`24`	`19`
`25`	`20`	`private void Form_Loaded(object sender, RoutedEventArgs e)`
`26`	`21`	`{`
`27`		`- if (!viewModel.CanSubmitFirstStep)`
	`22`	`+ if (!ViewModel.CanSubmitFirstStep)`
`28`	`23`	`{`
`29`	`24`	`Identifier.Focus(FocusState.Programmatic);`
`30`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,24 +11,19 @@ public abstract class RegisterPageBase : AccountEntryPageBase<RegisterViewModel>`
`11`	`11`
`12`	`12`	`public sealed partial class RegisterPage : RegisterPageBase`
`13`	`13`	`{`
`14`		`- protected override IDictionary<string, UIElement> ConnectedElements => new Dictionary<string, UIElement>`
`15`		`- {`
`16`		`- ["title"] = Title,`
`17`		`- ["first-field"] = Username`
`18`		`- };`
`19`		`- protected override RegisterViewModel viewModel => AppBase.GetService<RegisterViewModel>();`
	`14`	`+ protected override RegisterViewModel ViewModel => AppBase.GetService<RegisterViewModel>();`
`20`	`15`
`21`	`16`	`private readonly IPreferences preferences = AppBase.GetService<IPreferences>();`
`22`	`17`
`23`	`18`	`public RegisterPage() => InitializeComponent();`
`24`	`19`
`25`	`20`	`private void Form_Loaded(object sender, RoutedEventArgs e)`
`26`	`21`	`{`
`27`		`- if (!viewModel.IsUsernameValid)`
	`22`	`+ if (!ViewModel.IsUsernameValid)`
`28`	`23`	`{`
`29`	`24`	`Username.Focus(FocusState.Programmatic);`
`30`	`25`	`}`
`31`		`- else if (!viewModel.IsEmailValid)`
	`26`	`+ else if (!ViewModel.IsEmailValid)`
`32`	`27`	`{`
`33`	`28`	`Email.Focus(FocusState.Programmatic);`
`34`	`29`	`}`