From 5c18dce404e65cd753221886c7697842a18ebe1d Mon Sep 17 00:00:00 2001
From: ANTONIO CABRERA TORNERO <acabrera@bravent.net>
Date: Thu, 14 Dec 2017 10:39:47 +0100
Subject: [PATCH] =?UTF-8?q?#52=20CompletingRequests=20Label=20a=C3=B1adida?=
 =?UTF-8?q?=20a=20la=20preview=20del=20mapa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AeccApp/AeccApp.Core/Views/HomeView.xaml  |  4 ++-
 .../Views/News/NewsDetailView.xaml            |  2 +-
 .../Home/CompletingHomeRequestView.xaml       | 32 +++++++++++++++++
 .../Requests/Home/NewHomeAddressView.xaml     |  2 +-
 .../CompletingHospitalRequestView.xaml        | 36 +++++++++++++++++--
 5 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/src/Mobile/AeccApp/AeccApp.Core/Views/HomeView.xaml b/src/Mobile/AeccApp/AeccApp.Core/Views/HomeView.xaml
index 23ef15c..03fcaa0 100644
--- a/src/Mobile/AeccApp/AeccApp.Core/Views/HomeView.xaml
+++ b/src/Mobile/AeccApp/AeccApp.Core/Views/HomeView.xaml
@@ -63,10 +63,12 @@
 
                         <ctrl:CustomImage
                             Margin="0,0,10,0"
+                            HeightRequest="13"
                             HorizontalOptions="End"
                             InputTransparent="True"
                             SourcePlatform="x_icon_grey"
-                            VerticalOptions="Center" />
+                            VerticalOptions="Center"
+                            WidthRequest="13" />
                     </Grid>
 
                 </Grid>
diff --git a/src/Mobile/AeccApp/AeccApp.Core/Views/News/NewsDetailView.xaml b/src/Mobile/AeccApp/AeccApp.Core/Views/News/NewsDetailView.xaml
index 0f5cc60..3261113 100644
--- a/src/Mobile/AeccApp/AeccApp.Core/Views/News/NewsDetailView.xaml
+++ b/src/Mobile/AeccApp/AeccApp.Core/Views/News/NewsDetailView.xaml
@@ -9,7 +9,7 @@
     Title="{Binding [NewsDetailViewTitle]}"
     vm:ViewModelLocator.AutoWireViewModel="True"
     BackgroundColor="{StaticResource BackgroundColor}">
-    <ScrollView Margin="20,0,20,0">
+    <ScrollView Padding="20,0,20,0">
         <StackLayout Orientation="Vertical" VerticalOptions="FillAndExpand">
             <Image
                 HeightRequest="250"
diff --git a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/CompletingHomeRequestView.xaml b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/CompletingHomeRequestView.xaml
index 99a182c..5924d22 100644
--- a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/CompletingHomeRequestView.xaml
+++ b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/CompletingHomeRequestView.xaml
@@ -44,6 +44,38 @@
                     Margin="0"
                     BackgroundColor="Transparent"
                     Command="{Binding MapDetailCommand}" />
+                <Grid InputTransparent="True">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
+                    <BoxView Grid.Row="0" BackgroundColor="Transparent" />
+                    <Frame
+                        Grid.Row="1"
+                        Margin="35,0,35,0"
+                        Padding="1"
+                        BackgroundColor="{StaticResource LightGraySubtitle}"
+                        CornerRadius="25"
+                        HasShadow="False"
+                        HorizontalOptions="Center"
+                        VerticalOptions="Center">
+                        <Frame
+                            Margin="0"
+                            Padding="15,3,15,3"
+                            BackgroundColor="White"
+                            CornerRadius="25"
+                            HasShadow="False"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
+                            <Label
+                                Margin="0"
+                                FontSize="{StaticResource MediumSize}"
+                                HorizontalOptions="Center"
+                                HorizontalTextAlignment="Start"
+                                Text="{Binding CurrentAddress.DisplayAddress}" />
+                        </Frame>
+                    </Frame>
+                </Grid>
             </Grid>
 
             <!--  Date and time text and button  -->
diff --git a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/NewHomeAddressView.xaml b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/NewHomeAddressView.xaml
index bcf8759..6f0e1dc 100644
--- a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/NewHomeAddressView.xaml
+++ b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Home/NewHomeAddressView.xaml
@@ -88,6 +88,7 @@
                         Margin="0"
                         Padding="10"
                         BackgroundColor="Transparent"
+                        HasShadow="False"
                         HorizontalOptions="Center"
                         IsVisible="{Binding IsSearchIconVisible}">
                         <ctrl:CustomImage SourcePlatform="x_icon" VerticalOptions="Center" />
@@ -254,7 +255,6 @@
                                 EventName="Toggled" />
                         </Switch.Behaviors>
                     </Switch>
-
                     <Label Style="{StaticResource SwitchTextStyle}" Text="{Binding [NewHomeAddressViewSaveAddress]}" />
                 </StackLayout>
 
diff --git a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Hospital/CompletingHospitalRequestView.xaml b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Hospital/CompletingHospitalRequestView.xaml
index 5ef6eab..4142088 100644
--- a/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Hospital/CompletingHospitalRequestView.xaml
+++ b/src/Mobile/AeccApp/AeccApp.Core/Views/Requests/Hospital/CompletingHospitalRequestView.xaml
@@ -41,8 +41,6 @@
                             WinPhone="130"
                             iOS="130" />
                     </Grid.HeightRequest>
-
-                    <!--  Avoid InitialCameraUpdate on map (iOS bug)  -  https://github.com/amay077/Xamarin.Forms.GoogleMaps/issues/310  -->
                     <maps:Map
                         x:Name="map"
                         HasZoomEnabled="False"
@@ -55,6 +53,40 @@
                             <TapGestureRecognizer Command="{Binding MapDetailCommand}" />
                         </BoxView.GestureRecognizers>
                     </BoxView>
+
+                    <Grid InputTransparent="True">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <BoxView Grid.Row="0" BackgroundColor="Transparent" />
+                        <Frame
+                            Grid.Row="1"
+                            Margin="35,0,35,0"
+                            Padding="1"
+                            BackgroundColor="{StaticResource LightGraySubtitle}"
+                            CornerRadius="25"
+                            HasShadow="False"
+                            HorizontalOptions="Center"
+                            VerticalOptions="Center">
+                            <Frame
+                                Margin="0"
+                                Padding="15,3,15,3"
+                                BackgroundColor="White"
+                                CornerRadius="25"
+                                HasShadow="False"
+                                HorizontalOptions="Center"
+                                VerticalOptions="Center">
+                                <Label
+                                    Margin="0"
+                                    FontSize="{StaticResource MediumSize}"
+                                    HorizontalOptions="Center"
+                                    HorizontalTextAlignment="Start"
+                                    Text="{Binding CurrentAddress.DisplayAddress}" />
+                            </Frame>
+                        </Frame>
+                    </Grid>
+                    <!--  Avoid InitialCameraUpdate on map (iOS bug)  -  https://github.com/amay077/Xamarin.Forms.GoogleMaps/issues/310  -->
                 </Grid>
                 <!--  Save hospital switch  -->
                 <StackLayout