From e43ba379ab8216fd725bd468204941d94227ed05 Mon Sep 17 00:00:00 2001
From: cocoa-dev003 <66989607+cocoa-dev003@users.noreply.github.com>
Date: Mon, 1 Aug 2022 10:59:50 +0900
Subject: [PATCH] Fix to focus on the date label after closing the dialog

---
 .../ViewModels/HomePage/HomePageViewModel.cs          | 11 ++++++++++-
 .../Covid19Radar/Views/HomePage/HomePage.xaml         |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/HomePage/HomePageViewModel.cs
index 02caac75c..a3e178a45 100644
--- 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
index 8af171666..f4b64d2ae 100644
--- 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"