Fix to focus on the date label after closing the dialog

cocoa-mhlw · Aug 1, 2022 · e43ba37 · e43ba37
1 parent c613149
commit e43ba37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
@@ -16,6 +16,7 @@
 using Prism.Navigation;
 using Xamarin.Forms;
 using Xamarin.Essentials;
+using Xamarin.CommunityToolkit.Extensions;
 
 namespace Covid19Radar.ViewModels
 {
@@ -329,7 +330,7 @@ INavigationParameters navigaitonParameters
  loggerService.EndMethod();
  });
 
- public Command OnClickQuestionIcon => new Command(() =>
+ public Command OnClickQuestionIcon => new Command<Label>((dateLabel) =>
  {
  loggerService.StartMethod();
 
@@ -338,6 +339,14 @@ INavigationParameters navigaitonParameters
  null,
  AppResources.ButtonClose);
 
+ if (Device.RuntimePlatform == Device.iOS && dateLabel != null)
+ {
+ Device.BeginInvokeOnMainThread(() =>
+ {
+ SemanticExtensions.SetSemanticFocus(dateLabel);
+ });
+ }
+
  loggerService.EndMethod();
  });
 

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
@@ -76,7 +76,8 @@
  Source="question_icon.png"
  Padding="5"
  BackgroundColor="Transparent"
- Command="{Binding Path=OnClickQuestionIcon}">
+ Command="{Binding Path=OnClickQuestionIcon}"
+ CommandParameter="{x:Reference activeConfirmationDateLabel}">
  <ImageButton.IsVisible>
  <OnPlatform
  x:TypeArguments="x:Boolean"
@@ -90,7 +91,8 @@
  AutomationProperties.Name="{x:Static resources:AppResources.HomePageQuestionIconAccessibilityTextiOS}"
  Aspect="AspectFit"
  Source="question_icon.png"
- Command="{Binding Path=OnClickQuestionIcon}">
+ Command="{Binding Path=OnClickQuestionIcon}"
+ CommandParameter="{x:Reference activeConfirmationDateLabel}">
  <ImageButton.IsVisible>
  <OnPlatform
  x:TypeArguments="x:Boolean"