From 23e2de17613fab6f0808fa2151c478b29d52a6e4 Mon Sep 17 00:00:00 2001
From: unlimish <me@unlimi.sh>
Date: Mon, 23 May 2022 19:31:22 +0900
Subject: [PATCH] Merge(HomePage Android): resolve conflict for ImageButton

---
 .../Covid19Radar/Views/HomePage/HomePage.xaml | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
index 375177bbc..8af171666 100644
--- a/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
+++ b/Covid19Radar/Covid19Radar/Views/HomePage/HomePage.xaml
@@ -69,22 +69,21 @@
                                 Style="{StaticResource DefaultLabelCaption}"
                                 VerticalOptions="Center"
                                 Text="{x:Static resources:AppResources.HomePageENStatusActiveDescription}" />
-                            <ffimageloading:CachedImage
+                            <ImageButton
                                 x:Name="activeQuestionImage"
-                                AutomationProperties.IsInAccessibleTree="{Binding IsVisibleENStatusActiveLayout}"
+                            AutomationProperties.IsInAccessibleTree="{Binding IsVisibleENStatusActiveLayout}"
                                 AutomationProperties.Name="{x:Static resources:AppResources.HomePageQuestionIconAccessibilityTextAndroid}"
-                                Aspect="AspectFit"
-                                Source="question_icon.png">
-                                <ffimageloading:CachedImage.IsVisible>
+                                Source="question_icon.png"
+                                Padding="5"
+                                BackgroundColor="Transparent"
+                                Command="{Binding Path=OnClickQuestionIcon}">
+                                <ImageButton.IsVisible>
                                     <OnPlatform
-                                        x:TypeArguments="x:Boolean"
-                                        Android="True"
-                                        iOS="False" />
-                                </ffimageloading:CachedImage.IsVisible>
-                                <ffimageloading:CachedImage.GestureRecognizers>
-                                    <TapGestureRecognizer Command="{Binding Path=OnClickQuestionIcon}" />
-                                </ffimageloading:CachedImage.GestureRecognizers>
-                            </ffimageloading:CachedImage>
+                                    x:TypeArguments="x:Boolean"
+                                    Android="True"
+                                    iOS="False" />
+                                </ImageButton.IsVisible>
+                            </ImageButton>
                             <ImageButton
                                 x:Name="activeQuestionButton"
                                 AutomationProperties.IsInAccessibleTree="{Binding IsVisibleENStatusActiveLayout}"