diff --git a/Controls/HealthBanner.xaml b/Controls/HealthBanner.xaml new file mode 100644 index 0000000..7578add --- /dev/null +++ b/Controls/HealthBanner.xaml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Controls/HealthBanner.xaml.cs b/Controls/HealthBanner.xaml.cs new file mode 100644 index 0000000..07c8744 --- /dev/null +++ b/Controls/HealthBanner.xaml.cs @@ -0,0 +1,11 @@ +using System.Windows.Controls; + +namespace ytLive.Controls; + +public partial class HealthBanner : UserControl +{ + public HealthBanner() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/MainWindow.xaml b/MainWindow.xaml index 4d15880..4999fbe 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -31,21 +31,6 @@ - - - - - - - - - @@ -207,14 +192,7 @@ - - - - + diff --git a/Themes/Controls.xaml b/Themes/Controls.xaml index 03f485d..ba336d4 100644 --- a/Themes/Controls.xaml +++ b/Themes/Controls.xaml @@ -1,5 +1,6 @@ + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:Helpers="clr-namespace:ytLive.Helpers"> + + + + + + + + + diff --git a/ViewModels/index.md b/ViewModels/index.md index 9017529..006ccc1 100644 --- a/ViewModels/index.md +++ b/ViewModels/index.md @@ -54,7 +54,8 @@ Progress (Commit N/12 · tag): - [x] **Phase 1 complete:** core `MainViewModel.cs` split into 10 functional partials (1,890 → 758 lines). **Phase 2 — `MainWindow.xaml` split into UserControls** (new `Controls/` folder, namespace `ytLive.Controls`): -- [x] **Commit 12 · `refactor-commit-12`** — **BottomBar** → `Controls/BottomBar.xaml(.cs)` (gear menu + stream stats + quality dropdown; `GearButton_Click` moved to the control's code-behind). Pending: TopBar, health banner, left scene/chat panel, preview pane, overlay host. +- [x] **Commit 12 · `refactor-commit-12`** — **BottomBar** → `Controls/BottomBar.xaml(.cs)` (gear menu + stream stats + quality dropdown; `GearButton_Click` moved to the control's code-behind). +- [x] **Commit 13 · `refactor-commit-13`** — **HealthBanner** → `Controls/HealthBanner.xaml` (Row 1). Also promoted the 7 value↔visibility converters out of `MainWindow.Window.Resources` into `Themes/Controls.xaml` so extracted controls can resolve them (app-level, not window-level). Pending: TopBar, left scene/chat panel, preview pane, overlay host. The partial `.cs` files land next to `MainViewModel.cs` in this folder as the split proceeds; each partial carries its own `using`s and re-declares nothing from core. \ No newline at end of file