Merge branch 'master' of github.com:timschneeb/GalaxyBudsClient

Author: timschneeb

Diff for: GalaxyBudsClient/Interface/Controls/EarbudIcon.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.IO;
 using Avalonia;
@@ -30,6 +30,7 @@ public EarbudIcon()
         BluetoothImpl.Instance.Connected += OnConnected;
         Settings.MainSettingsPropertyChanged += OnMainSettingsPropertyChanged;
         Settings.DevicePropertyChanged += OnDevicePropertyChanged;
+        Settings.Data.PropertyChanged += OnSettingsDataPropertyChanged;
         UpdateEarbudIcons();
     }
 
@@ -76,9 +77,15 @@ private void OnBluetoothPropertyChanged(object? sender, PropertyChangedEventArgs
         });
     }
 
+    private void OnSettingsDataPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(Settings.Data.ColorOverride))
+            UpdateEarbudIcons();
+    }
+
     private void UpdateEarbudIcons()
     {
-        var color = BluetoothImpl.Instance.Device.Current?.DeviceColor ?? DeviceMessageCache.Instance.ExtendedStatusUpdate?.DeviceColor;
+        var color = Settings.Data.ColorOverride ?? BluetoothImpl.Instance.Device.Current?.DeviceColor ?? DeviceMessageCache.Instance.ExtendedStatusUpdate?.DeviceColor;
         if (Settings.Data.RealisticEarbudImages && color != null &&
             BluetoothImpl.Instance.DeviceSpec.Supports(Features.DeviceColor))
         {

Diff for: GalaxyBudsClient/Interface/MarkupExtensions/DeviceColorBindingSource.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Avalonia.Markup.Xaml;
+using GalaxyBudsClient.Model.Constants;
+using GalaxyBudsClient.Message;
+using GalaxyBudsClient.Platform;
+using System.Reflection;
+using GalaxyBudsClient.Model.Attributes;
+using GalaxyBudsClient.Model.Config;
+
+namespace GalaxyBudsClient.Interface.MarkupExtensions;
+
+public class DeviceColorBindingSource : MarkupExtension
+{
+    public override object ProvideValue(IServiceProvider serviceProvider)
+    {
+        var currentDevice = BluetoothImpl.Instance.Device.Current;
+        if (currentDevice == null)
+            return Array.Empty<DeviceIds>();
+
+        // Get current device's model and color
+        var currentModel = currentDevice.Model;
+        var currentColor = currentDevice.DeviceColor ?? 
+                         DeviceMessageCache.Instance.ExtendedStatusUpdate?.DeviceColor ?? 
+                         DeviceIds.Unknown;
+
+        // Filter DeviceIds based on current model
+        var values = Enum.GetValues(typeof(DeviceIds))
+            .Cast<DeviceIds>()
+            .Where(x => {
+                var field = typeof(DeviceIds).GetField(x.ToString());
+                var attr = field?.GetCustomAttribute<AssociatedModelAttribute>();
+                return attr != null && attr.Model == currentModel;
+            })
+            .OrderBy(x => x.ToString())
+            .ToList();
+
+        // Move current color to top if it exists in the list
+        if (currentColor != DeviceIds.Unknown && values.Contains(currentColor))
+        {
+            values.Remove(currentColor);
+            values.Insert(0, currentColor);
+        }
+
+        // Set the initial value if no override is set
+        if (Settings.Data.ColorOverride == null)
+        {
+            Settings.Data.ColorOverride = currentColor;
+        }
+        
+        return values;
+    }
+}

Diff for: GalaxyBudsClient/Interface/Pages/SettingsPage.axaml

@@ -76,7 +76,7 @@
                         <ext:LocalizationAwareComboBoxBehavior />
                     </Interaction.Behaviors>
                 </controls:SettingsComboBoxItem>
-                
+
                 <controls:SettingsSliderItem
                     Content="{ext:Translate {x:Static i18N:Keys.SettingsBlurstrength}}"
                     Description="{ext:Translate {x:Static i18N:Keys.SettingsBlurstrengthDescription}}"
@@ -102,6 +102,14 @@
                                                Symbol="LocalLanguage"
                                                ItemsSource="{Binding Source={ext:LocalesBindingSource}}"
                                                SelectedValue="{Binding Locale, Source={x:Static config:Settings.Data}}" />
+                
+                <controls:SettingsComboBoxItem Name="ColorOverride"
+                                               Content="{ext:Translate {x:Static i18N:Keys.SettingsColorOverride}}"
+                                               Description="{ext:Translate {x:Static i18N:Keys.SettingsColorOverrideDescription}}"
+                                               Symbol="ColorFill"
+                                               IsEnabled="{Binding RealisticEarbudImages, Source={x:Static config:Settings.Data}}"
+                                               ItemsSource="{Binding ., Source={ext:DeviceColorBindingSource}}"
+                                               SelectedValue="{Binding ColorOverride, Source={x:Static config:Settings.Data}}" />
 
                 <controls:SettingsSwitchItem Content="{ext:Translate {x:Static i18N:Keys.SettingsRealisticEarbudIcons}}"
                                              Description="{ext:Translate {x:Static i18N:Keys.SettingsRealisticEarbudIconsDescription}}"

Diff for: GalaxyBudsClient/Model/Config/SettingsData.cs

@@ -36,6 +36,7 @@ public class SettingsData : ReactiveObject
     [Reactive] public TemperatureUnits TemperatureUnit { set; get; } = TemperatureUnits.Celsius;
     [Reactive] public bool RealisticEarbudImages { set; get; } = true;
     [Reactive] public bool ShowSidebar { set; get; } = Settings.DefaultShowSidebar;
+    [Reactive] public DeviceIds? ColorOverride { set; get; }
 
     /* Connections */
     [Reactive] public bool UseBluetoothWinRt { set; get; } = true;

Diff for: GalaxyBudsClient/i18n/en.axaml

@@ -427,6 +427,8 @@ Measure level: Select a vertical span to measure the battery level difference be
     <sys:String x:Key="settings_minimize_tray_description">Keep in background instead of terminating the app</sys:String>
     <sys:String x:Key="settings_realistic_earbud_icons">Use realistic earbud images</sys:String>
     <sys:String x:Key="settings_realistic_earbud_icons_description">Display realistic &amp; color-aware images of your earbuds, if they support it</sys:String>
+    <sys:String x:Key="settings_color_override">Earbud color override</sys:String>
+    <sys:String x:Key="settings_color_override_description">Change the displayed color of your earbuds in the app</sys:String>
     <sys:String x:Key="settings_nav_sidebar">Navigation sidebar</sys:String>
     <sys:String x:Key="settings_nav_sidebar_description">Show or collapse the navigation buttons on the left hand side</sys:String>
     <sys:String x:Key="settings_tray_settings">Tray icon &amp; startup</sys:String>

Diff for: GalaxyBudsClient/i18n/tr.axaml

@@ -375,6 +375,8 @@ Bittiğinde, toplanan tüm veriler için bir dizin seçmeniz istenecektir.
     <sys:String x:Key="settings_accent">Vurgu rengi</sys:String>
     <sys:String x:Key="settings_realistic_earbud_icons">Kulaklıkların gerçekçi resimlerini kullan</sys:String>
     <sys:String x:Key="settings_realistic_earbud_icons_description">Destekliyorsa, kulaklıklarınızın gerçekçi ve renk uyumlu resimlerini görüntüler</sys:String>
+    <sys:String x:Key="settings_color_override">Kulaklık resminin rengi</sys:String>
+    <sys:String x:Key="settings_color_override_description">Kulaklıklarınızın uygulamada görünen rengini değiştirin.</sys:String>
     <sys:String x:Key="settings_accent_description">Özel bir vurgu rengi seçin</sys:String>
     <sys:String x:Key="settings_transitions_description">Kaydırma geçişlerini etkinleştir</sys:String>
     <sys:String x:Key="settings_localization_disable">Dil</sys:String>

Diff for: meta/cn.md

@@ -4,13 +4,15 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>100%</td><td>No missing strings</td></tr>
+<tr><td>99%</td><td>2 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
 
 <table>
 <tr><th>Key</th><th>Original string</th></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 
 </table>
 

Diff for: meta/cz.md

@@ -4,13 +4,15 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>100%</td><td>No missing strings</td></tr>
+<tr><td>99%</td><td>2 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
 
 <table>
 <tr><th>Key</th><th>Original string</th></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 
 </table>
 

Diff for: meta/de.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>44%</td><td>311 missing string(s)</td></tr>
+<tr><td>44%</td><td>313 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -193,6 +193,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/es.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>26%</td><td>411 missing string(s)</td></tr>
+<tr><td>26%</td><td>413 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -274,6 +274,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/fr.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>54%</td><td>252 missing string(s)</td></tr>
+<tr><td>54%</td><td>254 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -187,6 +187,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/gr.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>44%</td><td>310 missing string(s)</td></tr>
+<tr><td>44%</td><td>312 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -195,6 +195,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/hu.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>60%</td><td>220 missing string(s)</td></tr>
+<tr><td>60%</td><td>222 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -176,6 +176,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/il.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>60%</td><td>220 missing string(s)</td></tr>
+<tr><td>60%</td><td>222 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -176,6 +176,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/in.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>26%</td><td>408 missing string(s)</td></tr>
+<tr><td>26%</td><td>410 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -273,6 +273,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/it.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>46%</td><td>296 missing string(s)</td></tr>
+<tr><td>46%</td><td>298 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -216,6 +216,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>

Diff for: meta/ja.md

@@ -4,7 +4,7 @@ This file is auto-generated and automatically updated. Do not modify this file m
 
 <table>
 <tr><th>Progress</th><th>Count</th></tr>
-<tr><td>26%</td><td>411 missing string(s)</td></tr>
+<tr><td>26%</td><td>413 missing string(s)</td></tr>
 </table>
 
 ### Missing strings
@@ -274,6 +274,8 @@ Measure level: Select a vertical span to measure the battery level difference be
 <tr><td><code>settings_localization_description</code></td><td>Change the app language</td></tr>
 <tr><td><code>settings_realistic_earbud_icons</code></td><td>Use realistic earbud images</td></tr>
 <tr><td><code>settings_realistic_earbud_icons_description</code></td><td>Display realistic & color-aware images of your earbuds, if they support it</td></tr>
+<tr><td><code>settings_color_override</code></td><td>Earbud color override</td></tr>
+<tr><td><code>settings_color_override_description</code></td><td>Change the displayed color of your earbuds in the app</td></tr>
 <tr><td><code>settings_nav_sidebar</code></td><td>Navigation sidebar</td></tr>
 <tr><td><code>settings_nav_sidebar_description</code></td><td>Show or collapse the navigation buttons on the left hand side</td></tr>
 <tr><td><code>settings_tray_settings</code></td><td>Tray icon & startup</td></tr>