feat(ui): apply flow direction to modals, default confirmations to Cancel and guard code-behind resources

YKanBan/App.axaml.cs

@@ -28,6 +28,12 @@ public partial class App : Application {
     /// </summary>
     public static string StartupLanguage { get; private set; } = AppConfig.DefaultLanguage;
 
+    /// <summary>
+    /// Gets the flow direction of the startup culture. FlowDirection does not
+    /// inherit across windows, so the main window and every modal window apply it.
+    /// </summary>
+    public static FlowDirection UiFlowDirection { get; private set; } = FlowDirection.LeftToRight;
+
     public override void Initialize() {
         AvaloniaXamlLoader.Load(this);
     }
@@ -42,18 +48,19 @@ public partial class App : Application {
             CultureInfo culture = ResolveCulture(Services.Config.Language);
             StartupLanguage = Services.Config.Language;
             Resx.Culture = culture;
+
+            // RTL detection drives the flow direction of every window; the two
+            // supported languages are LTR, but the infrastructure stays in
+            // place for future languages.
+            UiFlowDirection = culture.TextInfo.IsRightToLeft
+                ? FlowDirection.RightToLeft
+                : FlowDirection.LeftToRight;
             ApplyTheme(Services.Config.Theme);
 
             var viewModel = new MainWindowViewModel(Services, desktop.Args ?? []);
             desktop.MainWindow = new MainWindow {
                 DataContext = viewModel,
-
-                // RTL detection drives the whole window flow direction; the two
-                // supported languages are LTR, but the infrastructure stays in
-                // place for future languages.
-                FlowDirection = culture.TextInfo.IsRightToLeft
-                    ? FlowDirection.RightToLeft
-                    : FlowDirection.LeftToRight,
+                FlowDirection = UiFlowDirection,
             };
         }
 

YKanBan/ViewLocator.cs

@@ -20,6 +20,10 @@ public class ViewLocator : IDataTemplate {
             return (Control)Activator.CreateInstance(type)!;
         }
 
+        // YYC MARK: the missing-view placeholder is a programmer error (a view
+        // model without its matching view), not a user-facing message. It must be
+        // caught by the code-behind convention test before release, so it is kept
+        // as a hard-coded English diagnostic and is deliberately not localized.
         return new TextBlock { Text = "Not Found: " + name };
     }
 

YKanBan/Views/Board/BoardView.axaml.cs

@@ -44,7 +44,7 @@ public partial class BoardView : UserControl {
         var dialog = new ColumnEditorDialog {
             DataContext = new ColumnEditorViewModel(board.Repository, column?.Model),
         };
-        if (await dialog.ShowDialog<bool>(owner)) {
+        if (await ModalWindow.ShowAsync<bool>(owner, dialog)) {
             board.Reload();
         }
     }
@@ -62,7 +62,7 @@ public partial class BoardView : UserControl {
             var dialog = new DeleteColumnConfirmDialog {
                 DataContext = new DeleteColumnConfirmViewModel(column.Title, column.CardCount),
             };
-            confirmed = await dialog.ShowDialog<bool>(owner);
+            confirmed = await ModalWindow.ShowAsync<bool>(owner, dialog);
         }
 
         if (!confirmed) {
@@ -85,7 +85,7 @@ public partial class BoardView : UserControl {
         var dialog = new CardEditorDialog {
             DataContext = new CardEditorViewModel(board.Repository, columnId, card?.Model),
         };
-        if (await dialog.ShowDialog<bool>(owner)) {
+        if (await ModalWindow.ShowAsync<bool>(owner, dialog)) {
             board.Reload();
         }
     }
@@ -103,7 +103,7 @@ public partial class BoardView : UserControl {
             var dialog = new DeleteCardConfirmDialog {
                 DataContext = new DeleteCardConfirmViewModel(card.Id),
             };
-            confirmed = await dialog.ShowDialog<bool>(owner);
+            confirmed = await ModalWindow.ShowAsync<bool>(owner, dialog);
         }
 
         if (!confirmed) {
@@ -125,7 +125,7 @@ public partial class BoardView : UserControl {
         var dialog = new MoveCardDialog {
             DataContext = new MoveCardViewModel(board.Repository.GetColumns(), card.ColumnId),
         };
-        if (await dialog.ShowDialog<long?>(owner) is long targetColumnId) {
+        if (await ModalWindow.ShowAsync<long?>(owner, dialog) is long targetColumnId) {
             board.Repository.MoveCard(card.Id, targetColumnId);
             board.Reload();
         }
@@ -142,6 +142,6 @@ public partial class BoardView : UserControl {
         var dialog = new SearchErrorDialog {
             DataContext = new SearchErrorViewModel(detail),
         };
-        await dialog.ShowDialog(owner);
+        await ModalWindow.ShowAsync(owner, dialog);
     }
 }

YKanBan/Views/Dialogs/CardEditorDialog.axaml.cs

@@ -35,7 +35,7 @@ public partial class CardEditorDialog : Window {
                 viewModel.Repository,
                 viewModel.AssignedTags.Select(row => row.Tag.Id).ToList()),
         };
-        return await dialog.ShowDialog<TagModel?>(this);
+        return await ModalWindow.ShowAsync<TagModel?>(this, dialog);
     }
 
     /// <summary>
@@ -76,7 +76,7 @@ public partial class CardEditorDialog : Window {
     private async Task RequestCloseAsync() {
         if (HasUnsavedChanges && DiscardConfirmEnabled) {
             var dialog = new DiscardEditConfirmDialog { DataContext = new DiscardEditConfirmViewModel() };
-            if (!await dialog.ShowDialog<bool>(this)) {
+            if (!await ModalWindow.ShowAsync<bool>(this, dialog)) {
                 return;
             }
         }

YKanBan/Views/Dialogs/DeleteCardConfirmDialog.axaml

@@ -16,9 +16,9 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90" IsDefault="True"/>
+                    MinWidth="90"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
-                    MinWidth="90" IsCancel="True"/>
+                    MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
     </Grid>
 </Window>

YKanBan/Views/Dialogs/DeleteColumnConfirmDialog.axaml

@@ -16,9 +16,9 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90" IsDefault="True"/>
+                    MinWidth="90"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
-                    MinWidth="90" IsCancel="True"/>
+                    MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
     </Grid>
 </Window>

YKanBan/Views/Dialogs/DeleteTagConfirmDialog.axaml

@@ -16,9 +16,9 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Delete}" Click="OnConfirmClick"
-                    MinWidth="90" IsDefault="True"/>
+                    MinWidth="90"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
-                    MinWidth="90" IsCancel="True"/>
+                    MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
     </Grid>
 </Window>

YKanBan/Views/Dialogs/DiscardEditConfirmDialog.axaml

@@ -16,9 +16,9 @@
         <TextBlock Grid.Row="0" Text="{Binding Message}" TextWrapping="Wrap" VerticalAlignment="Top"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
             <Button Content="{x:Static lang:Resources.Common_Ok}" Click="OnConfirmClick"
-                    MinWidth="90" IsDefault="True"/>
+                    MinWidth="90"/>
             <Button Content="{x:Static lang:Resources.Common_Cancel}" Click="OnCancelClick"
-                    MinWidth="90" IsCancel="True"/>
+                    MinWidth="90" IsDefault="True" IsCancel="True"/>
         </StackPanel>
     </Grid>
 </Window>

YKanBan/Views/MainWindow.axaml.cs

@@ -33,7 +33,7 @@ public partial class MainWindow : Window {
         var dialog = new SettingsDialog {
             DataContext = new SettingsDialogViewModel(App.Services.Config, App.StartupLanguage),
         };
-        await dialog.ShowDialog(this);
+        await ModalWindow.ShowAsync(this, dialog);
     }
 
     /// <summary>
@@ -43,6 +43,6 @@ public partial class MainWindow : Window {
         var dialog = new AboutDialog {
             DataContext = new AboutDialogViewModel(),
         };
-        await dialog.ShowDialog(this);
+        await ModalWindow.ShowAsync(this, dialog);
     }
 }

YKanBan/Views/ModalWindow.cs

@@ -0,0 +1,33 @@
+using Avalonia.Controls;
+
+namespace YKanBan.Views;
+
+/// <summary>
+/// Shows a modal window owned by another window, applying the startup culture's
+/// flow direction first. FlowDirection does not inherit across windows, so every
+/// modal must apply it explicitly.
+/// </summary>
+internal static class ModalWindow {
+    /// <summary>
+    /// Shows a modal window that returns a result.
+    /// </summary>
+    /// <param name="owner">The owning window.</param>
+    /// <param name="dialog">The modal window to show.</param>
+    /// <typeparam name="TResult">The dialog result type.</typeparam>
+    /// <returns>A task completing with the dialog result.</returns>
+    public static Task<TResult> ShowAsync<TResult>(Window owner, Window dialog) {
+        dialog.FlowDirection = App.UiFlowDirection;
+        return dialog.ShowDialog<TResult>(owner);
+    }
+
+    /// <summary>
+    /// Shows a modal window that has no result.
+    /// </summary>
+    /// <param name="owner">The owning window.</param>
+    /// <param name="dialog">The modal window to show.</param>
+    /// <returns>A task completing when the dialog closes.</returns>
+    public static Task ShowAsync(Window owner, Window dialog) {
+        dialog.FlowDirection = App.UiFlowDirection;
+        return dialog.ShowDialog(owner);
+    }
+}

YKanBan/Views/Tags/TagsView.axaml.cs

@@ -39,7 +39,7 @@ public partial class TagsView : UserControl {
         var dialog = new TagEditorDialog {
             DataContext = new TagEditorViewModel(tags.Repository, item?.Tag),
         };
-        if (await dialog.ShowDialog<bool>(owner)) {
+        if (await ModalWindow.ShowAsync<bool>(owner, dialog)) {
             tags.RefreshAfterChange();
         }
     }
@@ -57,7 +57,7 @@ public partial class TagsView : UserControl {
             var dialog = new DeleteTagConfirmDialog {
                 DataContext = new DeleteTagConfirmViewModel(item.Name, item.UsageCount),
             };
-            confirmed = await dialog.ShowDialog<bool>(owner);
+            confirmed = await ModalWindow.ShowAsync<bool>(owner, dialog);
         }
 
         if (!confirmed) {

YKanBan/Views/WorkspaceView.axaml.cs

@@ -66,7 +66,7 @@ public partial class WorkspaceView : UserControl {
             var dialog = new ExportDoneDialog {
                 DataContext = new ExportDoneViewModel(file.TryGetLocalPath() ?? file.Name),
             };
-            await dialog.ShowDialog(owner);
+            await ModalWindow.ShowAsync(owner, dialog);
         }
     }
 }