Added a Open() method to use for our consumers, renamed x:names

DIPSAS · Jan 9, 2020 · 7c2605d · 7c2605d
1 parent 784a7f0
commit 7c2605d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/DIPS.Xamarin.UI/Controls/DatePicker/DatePicker.xaml.cs b/src/DIPS.Xamarin.UI/Controls/DatePicker/DatePicker.xaml.cs
@@ -138,5 +138,13 @@ private static void OnDateChanged(BindableObject bindable, object oldvalue, obje
             if (!(formattedObject is string formattedDate)) return;
             datePicker.DateLabel.Text = formattedDate;
         }
+
+        /// <summary>
+        /// Opens the date picker
+        /// </summary>
+        public void Open()
+        {
+            FormsDatePicker.Focus();
+        }
     }
 }
diff --git a/src/DIPS.Xamarin.UI/Controls/TimePicker/TimePicker.xaml b/src/DIPS.Xamarin.UI/Controls/TimePicker/TimePicker.xaml
@@ -9,13 +9,13 @@
              x:Class="DIPS.Xamarin.UI.Controls.TimePicker.TimePicker"
              x:Name="codeBehind">
     <Grid IsClippedToBounds="True">
-        <TimePicker x:Name="FormsDatePicker"
+        <TimePicker x:Name="FormsTimePicker"
                     Time="{Binding Source={x:Reference codeBehind}, Path=Time}"
                     Margin="{Binding Source={x:Reference DateLabel}, Path=Height, Converter={ValueConverters:MultiplicationConverter Factor=-1}}"
                     TextColor="Transparent"
                     HeightRequest="{Binding Source={x:Reference DateLabel}, Path=Height}"
                     WidthRequest="{Binding Source={x:Reference DateLabel}, Path=Width}" />
-        <Label x:Name="DateLabel"
+        <Label x:Name="TimeLabel"
                Text="{Binding Source={x:Reference codeBehind}, Path=Time}"
                TextColor="{Binding Source={x:Reference codeBehind}, Path=LabelColor}"
                InputTransparent="True"

diff --git a/src/DIPS.Xamarin.UI/Controls/TimePicker/TimePicker.xaml.cs b/src/DIPS.Xamarin.UI/Controls/TimePicker/TimePicker.xaml.cs
@@ -46,7 +46,7 @@ public partial class TimePicker : ContentView
         private static void OnLabelSizePropertyChanged(BindableObject bindable, object oldvalue, object newvalue)
         {
             if (!(bindable is TimePicker timePicker)) return;
-            timePicker.DateLabel.FontSize = (double)newvalue;
+            timePicker.TimeLabel.FontSize = (double)newvalue;
         }
 
         /// <inheritdoc />
@@ -104,7 +104,12 @@ private static void TimePropertyChanged(BindableObject bindable, object oldvalue
             var formattedObject = new TimeConverter() { Format = timePicker.Format }.Convert(timePicker.Time, null, null, CultureInfo.CurrentCulture);
             if (!(formattedObject is string formattedDate))
                 return;
-            timePicker.DateLabel.Text = formattedDate;
+            timePicker.TimeLabel.Text = formattedDate;
+        }
+
+        public void Open()
+        {
+            FormsTimePicker.Focus();
         }
     }
 }