Split DeviceChannelSelector to per device type separate components by vicocz · Pull Request #234 · vicocz/brickcontroller2

vicocz · 2026-07-01T19:36:42Z

No description provided.

Copilot

Pull request overview

This PR refactors the UI channel selector by splitting the previous monolithic DeviceChannelSelector XAML into per-device selector components, and introducing a shared base class plus a registry-based factory to load the appropriate selector at runtime.

Changes:

Added per-device *ChannelSelectorView XAML + code-behind components under UI/Controls/Devices.
Introduced DeviceChannelSelectorViewBase (shared bindable properties + button registration wiring) and IDeviceChannelSelectorView (static device identity).
Refactored DeviceChannelSelector to dynamically instantiate the correct per-device selector via a registry; updated the project file to ensure XAML compilation.

Reviewed changes

Copilot reviewed 47 out of 47 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
BrickController2/BrickController2/UI/Controls/Devices/WeDo2ChannelSelectorView.xaml.cs	New WeDo2 selector view code-behind using shared base registration.
BrickController2/BrickController2/UI/Controls/Devices/WeDo2ChannelSelectorView.xaml	New WeDo2 selector layout extracted from the old monolithic XAML.
BrickController2/BrickController2/UI/Controls/Devices/TechnicMoveChannelSelectorView.xaml.cs	New Technic Move selector with device-dependent visibility logic.
BrickController2/BrickController2/UI/Controls/Devices/TechnicMoveChannelSelectorView.xaml	New Technic Move selector layout.
BrickController2/BrickController2/UI/Controls/Devices/TechnicHubChannelSelectorView.xaml.cs	New Technic Hub selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/TechnicHubChannelSelectorView.xaml	New Technic Hub selector layout.
BrickController2/BrickController2/UI/Controls/Devices/SBrickLightChannelSelectorView.xaml.cs	New SBrick Light selector with custom port/subchannel handling.
BrickController2/BrickController2/UI/Controls/Devices/SBrickLightChannelSelectorView.xaml	New SBrick Light selector layout (includes settings UI).
BrickController2/BrickController2/UI/Controls/Devices/SBrickChannelSelectorView.xaml.cs	New SBrick selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/SBrickChannelSelectorView.xaml	New SBrick selector layout.
BrickController2/BrickController2/UI/Controls/Devices/PowerFunctionsChannelSelectorView.xaml.cs	New Infrared/Power Functions selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/PowerFunctionsChannelSelectorView.xaml	New Infrared/Power Functions selector layout.
BrickController2/BrickController2/UI/Controls/Devices/PoweredUpChannelSelectorView.xaml.cs	New Powered Up selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/PoweredUpChannelSelectorView.xaml	New Powered Up selector layout.
BrickController2/BrickController2/UI/Controls/Devices/PfxBrickChannelSelectorView.xaml.cs	New PFx Brick selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/PfxBrickChannelSelectorView.xaml	New PFx Brick selector layout.
BrickController2/BrickController2/UI/Controls/Devices/MK6ChannelSelectorView.xaml.cs	New MK6 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/MK6ChannelSelectorView.xaml	New MK6 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/MK5ChannelSelectorView.xaml.cs	New MK5 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/MK5ChannelSelectorView.xaml	New MK5 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/MK4ChannelSelectorView.xaml.cs	New MK4 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/MK4ChannelSelectorView.xaml	New MK4 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/MK3_8ChannelSelectorView.xaml.cs	New MK3_8 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/MK3_8ChannelSelectorView.xaml	New MK3_8 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/MK_DIYChannelSelectorView.xaml.cs	New MK_DIY selector view code-behind (stamps MK4 labels intentionally).
BrickController2/BrickController2/UI/Controls/Devices/MK_DIYChannelSelectorView.xaml	New MK_DIY selector layout.
BrickController2/BrickController2/UI/Controls/Devices/JieStarSCM8ChannelSelectorView.xaml.cs	New JieStar SCM8 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/JieStarSCM8ChannelSelectorView.xaml	New JieStar SCM8 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/JieStarSCM4ChannelSelectorView.xaml.cs	New JieStar SCM4 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/JieStarSCM4ChannelSelectorView.xaml	New JieStar SCM4 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/DuploTrainHubChannelSelectorView.xaml.cs	New Duplo Train Hub selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/DuploTrainHubChannelSelectorView.xaml	New Duplo Train Hub selector layout.
BrickController2/BrickController2/UI/Controls/Devices/CircuitCubesChannelSelectorView.xaml.cs	New Circuit Cubes selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/CircuitCubesChannelSelectorView.xaml	New Circuit Cubes selector layout.
BrickController2/BrickController2/UI/Controls/Devices/CaDARaceCarChannelSelectorView.xaml.cs	New CaDA Race Car selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/CaDARaceCarChannelSelectorView.xaml	New CaDA Race Car selector layout.
BrickController2/BrickController2/UI/Controls/Devices/BuWizzChannelSelectorView.xaml.cs	New BuWizz selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/BuWizzChannelSelectorView.xaml	New BuWizz selector layout.
BrickController2/BrickController2/UI/Controls/Devices/BuWizz3ChannelSelectorView.xaml.cs	New BuWizz3 selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/BuWizz3ChannelSelectorView.xaml	New BuWizz3 selector layout.
BrickController2/BrickController2/UI/Controls/Devices/BoostChannelSelectorView.xaml.cs	New Boost selector view code-behind.
BrickController2/BrickController2/UI/Controls/Devices/BoostChannelSelectorView.xaml	New Boost selector layout.
BrickController2/BrickController2/UI/Controls/Devices/IDeviceChannelSelectorView.cs	New interface providing compile-time device type identity for selector views.
BrickController2/BrickController2/UI/Controls/Devices/DeviceChannelSelectorViewBase.cs	New shared base class that wires up button commands and SelectedChannel propagation.
BrickController2/BrickController2/UI/Controls/DeviceChannelSelector.xaml.cs	Refactored selector to registry-driven dynamic child view instantiation.
BrickController2/BrickController2/UI/Controls/DeviceChannelSelector.xaml	Simplified host XAML to a content placeholder for the active selector view.
BrickController2/BrickController2/BrickController2.csproj	Ensures new per-device XAML views are compiled as MAUI XAML.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@@ -152,7 +83,7 @@ private static object OnCoerceDevice(BindableObject bindable, object value)
        {
            if (bindable is DeviceChannelSelector dcs && value is Device device)
            {
-                // enforce update
+                // enforce update even when the same Device reference is re-set (e.g. TechnicMove PlayVM mode change)


Copilot

Pull request overview

Copilot reviewed 49 out of 49 changed files in this pull request and generated 4 comments.

+            // Register device channel selector views
+            foreach (var viewType in GetSubClassesOf<DeviceChannelSelectorViewBase>().Where(t => !t.IsAbstract && typeof(IDeviceChannelSelectorView).IsAssignableFrom(t)))
+            {
+                var deviceType = GetDeviceType(viewType);
+                builder.RegisterType(viewType).Keyed<DeviceChannelSelectorViewBase>(deviceType);


+/// <summary>
+/// Provides a compile-time device-type identity for each channel selector view so that
+/// </summary>


+/// <summary>
+/// Generic, fallback channel selector for <see cref="DeviceManagement.DeviceType.None"/>.
+/// Presents a single Picker whose items are the 1-based channel names ("1", "2", ...),


+    protected override void OnSelectedChannelChanged(int channel)
+    {
+        base.OnSelectedChannelChanged(channel);
+
+        if (ChannelPicker.SelectedIndex == channel)
+        {
+            return;
+        }
+
+        _suppressPickerSelectionChanged = true;
+        ChannelPicker.SelectedIndex = channel;
+        _suppressPickerSelectionChanged = false;
+    }


Copilot

Copilot review overview

🟡 Changes recommended

The new keyed selector views are never consumed, so the active UI still uses the old monolithic selector.

Get a fresh assessment by requesting another Copilot review.

Review effort: Balanced
Findings: 2 · 3 · 3

Open (8)

Resolve keyed device selector views in the selector host · New
Android Release builds enable trimming (<PublishTrimmed>true</PublishTrimmed>). These channel…
Make DeviceType abstract to enforce implementation · New
OnSelectedChannelChanged assigns ChannelPicker.SelectedIndex directly from SelectedChannel. If…
DeviceChannelSelector.DeviceProperty currently triggers OnDeviceChanged from both the coerceValue…
Localize the picker title · New
The summary references <see cref="DeviceManagement.DeviceType.None"/>, but the enum doesn’t define…
The XML summary is incomplete (it ends mid-sentence), which makes the generated docs unclear.

Resolved since last review (3)

Throwing NotSupportedException here will crash the UI if an unexpected DeviceType reaches this…
DeviceProperty uses both coerceValue and propertyChanged to call OnDeviceChanged, which means…
SelectedChannel is already kept in sync via the TwoWay binding created on the active child view…

+            foreach (var viewType in GetSubClassesOf<DeviceChannelSelectorViewBase>().Where(t => !t.IsAbstract && typeof(IDeviceChannelSelectorView).IsAssignableFrom(t)))
+            {
+                var deviceType = GetDeviceType(viewType);
+                builder.RegisterType(viewType).Keyed<DeviceChannelSelectorViewBase>(deviceType);


+public interface IDeviceChannelSelectorView
+{
+    /// <summary>The <see cref="DeviceType"/> this view handles.</summary>
+    static virtual DeviceType DeviceType => throw new InvalidOperationException();


+<devices:DeviceChannelSelectorViewBase
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:devices="clr-namespace:BrickController2.UI.Controls.Devices"
+    x:Class="BrickController2.UI.Controls.Devices.GenericChannelSelectorView">
+
+    <ContentView.Content>
+        <Grid>
+            <Picker x:Name="ChannelPicker"
+                    Title="Channel"
+                    HorizontalOptions="Fill"
+                    VerticalOptions="Center"
+                    SelectedIndexChanged="OnChannelPickerSelectedIndexChanged"/>


SPlit DeviceChannelSelector to per device type separate components

39b9ea3

vicocz added this to the 2026.2 milestone Jul 1, 2026

Vit Nemecky added 2 commits July 1, 2026 21:53

simplify channel selection handling

ccec111

appply device type based on properties of DeviceChannelSelectorViewBase

615af51

vicocz requested a review from Copilot July 1, 2026 20:56

Copilot started reviewing on behalf of vicocz July 1, 2026 20:57 View session

Copilot AI reviewed Jul 1, 2026

View reviewed changes

Copilot started work on behalf of vicocz July 3, 2026 18:13 View session

Remove redundant SelectedChannel sync callback

63b0187

Copilot finished work on behalf of vicocz July 3, 2026 18:18

vicocz added the enhancement New feature or request label Jul 16, 2026

Vit Nemecky added 4 commits July 27, 2026 20:31

Merge branch 'default' into local/ui-split-components-per-devicetype

6af7d4d

nit picks

d13fb67

use DI + generic channel selection component

6f7490b

...

96c1c74

vicocz requested a review from Copilot July 27, 2026 20:46

Copilot started reviewing on behalf of vicocz July 27, 2026 20:46 View session

Copilot AI reviewed Jul 27, 2026

View reviewed changes

vicocz added 2 commits September 19, 2026 12:25

resolve conflicts

a73e493

resolve conflicts

bb9e351

vicocz requested a balanced review from Copilot September 19, 2026 11:02

Copilot started reviewing on behalf of vicocz September 19, 2026 11:03 View session

Copilot AI reviewed Sep 19, 2026

View reviewed changes

Navigation Menu

Split DeviceChannelSelector to per device type separate components - #234

Split DeviceChannelSelector to per device type separate components#234
vicocz wants to merge 10 commits into
defaultfrom
local/ui-split-components-per-devicetype

vicocz commented Jul 1, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

vicocz commented Jul 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Copilot review overview

🟡 Changes recommended

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants