Added textcolor property

Author: ErlingMK

src/DIPS.Xamarin.UI/Controls/RadioButtonGroup/RadioButtonGroup.xaml

@@ -10,6 +10,5 @@
     <StackLayout x:Name="container"
                  Orientation="Vertical"
                  HorizontalOptions="{Binding Source={x:Reference codeBehind}, Path=HorizontalOptions}"
-                 VerticalOptions="{Binding Source={x:Reference codeBehind}, Path=VerticalOptions}"
-                 />
+                 VerticalOptions="{Binding Source={x:Reference codeBehind}, Path=VerticalOptions}"/>
 </ContentView>

src/DIPS.Xamarin.UI/Controls/RadioButtonGroup/RadioButtonGroup.xaml.cs

@@ -8,6 +8,7 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Internals;
 using Xamarin.Forms.Xaml;
+using RadioButton = DIPS.Xamarin.UI.Internal.xaml.RadioButton;
 
 namespace DIPS.Xamarin.UI.Controls.RadioButtonGroup
 {
@@ -17,8 +18,6 @@ namespace DIPS.Xamarin.UI.Controls.RadioButtonGroup
     [XamlCompilation(XamlCompilationOptions.Compile)]
     public partial class RadioButtonGroup : ContentView, IHandleRadioButtons
     {
-        private readonly IList<Internal.xaml.RadioButton> m_radioButtons = new List<Internal.xaml.RadioButton>();
-
         /// <summary>
         ///     <see cref="SelectedColor" />
         /// </summary>
@@ -48,8 +47,7 @@ public partial class RadioButtonGroup : ContentView, IHandleRadioButtons
             nameof(SeparatorColor),
             typeof(Color),
             typeof(RadioButtonGroup),
-            Color.Black,
-            BindingMode.OneWay);
+            Color.Black);
 
         /// <summary>
         ///     <see cref="ItemsSource" />
@@ -89,6 +87,18 @@ public partial class RadioButtonGroup : ContentView, IHandleRadioButtons
             BindingMode.TwoWay,
             propertyChanged: OnIsSelectedPropertyChanged);
 
+        /// <summary>
+        ///     <see cref="TextColor" />
+        /// </summary>
+        public static readonly BindableProperty TextColorProperty = BindableProperty.Create(
+            nameof(TextColor),
+            typeof(Color),
+            typeof(RadioButtonGroup),
+            Color.Black,
+            propertyChanged: TextColorPropertyChanged);
+
+        private readonly IList<RadioButton> m_radioButtons = new List<RadioButton>();
+
         /// <summary>
         ///     Constructs an radio button group
         /// </summary>
@@ -97,6 +107,16 @@ public RadioButtonGroup()
             InitializeComponent();
         }
 
+        /// <summary>
+        ///     Color of the text in the radiobutton label.
+        ///     This is a bindable property.
+        /// </summary>
+        public Color TextColor
+        {
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
+        }
+
         /// <summary>
         ///     The color for each radio button when it is not selected
         ///     This is a bindable property
@@ -174,7 +194,7 @@ public Color SeparatorColor
             set => SetValue(SeparatorColorProperty, value);
         }
 
-        void IHandleRadioButtons.OnRadioButtonTapped(Internal.xaml.RadioButton tappedRadioButton)
+        void IHandleRadioButtons.OnRadioButtonTapped(RadioButton tappedRadioButton)
         {
             if (SelectedItem == tappedRadioButton.Identifier) return;
 
@@ -185,29 +205,34 @@ void IHandleRadioButtons.OnRadioButtonTapped(Internal.xaml.RadioButton tappedRad
             SelectedItem = selectedObject;
         }
 
+        private static void TextColorPropertyChanged(BindableObject bindable, object oldvalue, object newvalue)
+        {
+            if (!(bindable is RadioButtonGroup radioButtonGroup))
+                return;
+            if (!(newvalue is Color newColor))
+                return;
+
+            radioButtonGroup.m_radioButtons.ForEach(rb => { rb.TextColor = newColor; });
+        }
+
         private static void OnItemsSourcePropertyChanged(BindableObject bindable, object oldvalue, object newvalue)
         {
             if (!(bindable is RadioButtonGroup radioButtonGroup)) return;
 
             var oldNotifyCollectionChanged = oldvalue as INotifyCollectionChanged;
-            if (oldNotifyCollectionChanged != null)
-            {
-                oldNotifyCollectionChanged.CollectionChanged -= radioButtonGroup.CollectionChanged;
-            }
+            if (oldNotifyCollectionChanged != null) oldNotifyCollectionChanged.CollectionChanged -= radioButtonGroup.CollectionChanged;
 
             var newItemsSource = newvalue as IEnumerable;
             if (newItemsSource == null) return;
 
             if (newItemsSource is INotifyCollectionChanged newNotifyCollectionChanged)
-            {
                 newNotifyCollectionChanged.CollectionChanged += radioButtonGroup.CollectionChanged;
-            }
 
             radioButtonGroup.Initialize(newItemsSource);
         }
 
         private void CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
+        {
             Initialize(ItemsSource);
         }
 
@@ -247,8 +272,8 @@ private void Initialize(IEnumerable newItems)
             var items = newItems.Cast<object>().ToArray();
             if (items.Length == 0) return;
 
-            AddSeparator();
-
+            AddSeparator();
+
             foreach (var item in newItems)
             {
                 AddItem(item);
@@ -259,31 +284,28 @@ private void Initialize(IEnumerable newItems)
             {
                 var selectedRadioButton = m_radioButtons.FirstOrDefault(rb => rb.Identifier == SelectedItem);
                 if (selectedRadioButton != null)
-                {
                     selectedRadioButton.IsSelected = true;
-                }
                 else
-                {
                     SelectedItem = null;
-                }
             }
         }
 
-        private void AddItem(object item)
-        {
-            var radioButton = new Internal.xaml.RadioButton
-            {
-                Text = item.GetPropertyValue(DisplayMemberPath),
-                Identifier = item,
-                SelectedColor = SelectedColor,
-                DeSelectedColor = DeSelectedColor,
-                Padding = new Thickness(0, 15, 0, 15),
-            };
-
+        private void AddItem(object item)
+        {
+            var radioButton = new RadioButton
+            {
+                TextColor = TextColor,
+                Text = item.GetPropertyValue(DisplayMemberPath),
+                Identifier = item,
+                SelectedColor = SelectedColor,
+                DeSelectedColor = DeSelectedColor,
+                Padding = new Thickness(0, 15, 0, 15)
+            };
+
             radioButton.RefreshColor(radioButton.IsSelected);
-            radioButton.Initialize(this);
-            m_radioButtons.Add(radioButton);
-            AddChild(radioButton);
+            radioButton.Initialize(this);
+            m_radioButtons.Add(radioButton);
+            AddChild(radioButton);
         }
 
         private void AddSeparator()
@@ -293,9 +315,9 @@ private void AddSeparator()
             AddChild(separator);
         }
 
-        private void AddChild(View view)
+        private void AddChild(View view)
         {
-            container.Children.Add(view);
+            container.Children.Add(view);
         }
 
         private static void OnIsSelectedPropertyChanged(BindableObject bindable, object oldvalue, object newvalue)

src/DIPS.Xamarin.UI/Internal/Xaml/RadioButton.xaml

@@ -38,6 +38,7 @@
                HeightRequest="{Binding Source={x:Reference outerButton}, Path=HeightRequest}"
                VerticalOptions="Center"
                Text="{Binding Text}"
+               TextColor="{Binding TextColor}"
                FontSize="Body"
                InputTransparent="True"
                Margin="{StaticResource spacing}" />

src/DIPS.Xamarin.UI/Internal/Xaml/RadioButton.xaml.cs

@@ -128,6 +128,14 @@ public string Text
             set => SetValue(TextProperty, value);
         }
 
+        public static readonly BindableProperty TextColorProperty = BindableProperty.Create(nameof(TextColor), typeof(Color), typeof(RadioButton), Color.Black);
+
+        public Color TextColor
+        {
+            get => (Color)GetValue(TextColorProperty);
+            set => SetValue(TextColorProperty, value);
+        }
+
         internal void Initialize(IHandleRadioButtons radioButtonsHandler)
         {
             m_radioButtonsHandler = radioButtonsHandler;

src/Samples/DIPS.Xamarin.UI.Samples/Controls/RadioButtonGroup/RadioButtonGroupPage.xaml

@@ -18,15 +18,16 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-            <ScrollView>
-            <dxui:RadioButtonGroup Grid.Row="0"
-                                    ItemsSource="{Binding Items}"
-                                    SelectedItem="{Binding SelectedItem}"
-                                    SelectedItemChangedCommand="{Binding SelectedItemChangedCommand}"
-                                    DisplayMemberPath="Name"
-                                    SelectedColor="{Binding SelectedColor}"
-                                    DeSelectedColor="{Binding DeSelectedColor}"
-                                    SeparatorColor="{Binding SeparatorColor}" />
+            <ScrollView
+                BackgroundColor="White">
+            <dxui:RadioButtonGroup ItemsSource="{Binding Items}"
+                                   SelectedItem="{Binding SelectedItem}"
+                                   SelectedItemChangedCommand="{Binding SelectedItemChangedCommand}"
+                                   DisplayMemberPath="Name"
+                                   SelectedColor="{Binding SelectedColor}"
+                                   DeSelectedColor="{Binding DeSelectedColor}"
+                                   SeparatorColor="{Binding SeparatorColor}" 
+                                   TextColor="White"/>
             </ScrollView>
         <ScrollView Grid.Row="1">
             <StackLayout>