Version 3.0.340

Meinkonrad/TINK/View/Map/MapPage.xaml

@@ -1,113 +1,116 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:maps="clr-namespace:Xamarin.Forms.GoogleMaps;assembly=Xamarin.Forms.GoogleMaps"
-             xmlns:bindings="clr-namespace:Xamarin.Forms.GoogleMaps.Bindings;assembly=Xamarin.Forms.GoogleMaps.Bindings"
-             xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
-             x:Class="TINK.View.Map.MapPage"
-             BackgroundColor="{DynamicResource Key=primary-back-title-color}">
-    <Shell.TitleView>
-            <Grid ColumnDefinitions="Auto, 1*">
-                <Image Style="{StaticResource Image-Navbar}"/>
-                <Label Style="{StaticResource Label-Navbar}"
-                   Text="{x:Static resources:AppResources.MarkingMapPage}"/>
-            </Grid>
-    </Shell.TitleView>
-    <Grid
-            RowDefinitions="3,46,1*,33"
-            ColumnDefinitions="1*,Auto,1*"
-            IsEnabled="{Binding IsMapPageEnabled}"
-            VerticalOptions="FillAndExpand"
-            >
-            <maps:Map
-                Grid.RowSpan="3"
-                Grid.ColumnSpan="3"
-                WidthRequest="320"
-                HeightRequest="800"
-                x:Name="MyMap"
-                IsShowingUser="False"
-                MapType="Street">
-                <maps:Map.Behaviors>
-                    <bindings:BindingPinsBehavior Value="{Binding Pins}"/>
-                    <bindings:PinClickedToCommandBehavior Command="{Binding PinClickedCommand}"/>
-                </maps:Map.Behaviors>
-            </maps:Map>
-            <Frame
-                CornerRadius="13"
-                Grid.Row="1"
-                Grid.Column="1"
-                Margin="0"
-                Padding="0"
-                BackgroundColor="{DynamicResource secondary-back-title-color}">
-                <StackLayout Orientation="Horizontal"
-                             Margin="0"
-                             Padding="0">
-                    <Button
-                        x:Name="KonradButton"
-                        AutomationId ="FilterKonrad_button"                    
-                        Text="{x:Static resources:AppResources.MarkingCityBike}"
-                        Command="{Binding OnToggleTinkToKonrad}" 
-                        IsVisible="{Binding IsToggleVisible}"
-                        BackgroundColor="{Binding KonradColor}"
-                        BorderColor="{Binding KonradColor}"
-                        BorderWidth="0"
-                        VerticalOptions="Center"
-                        HorizontalOptions="Center"
-                        WidthRequest="94"
-                        HeightRequest="40"
-                        BorderRadius="10"
-                        Margin="3,0,0,0"
-                        FontSize="Small"
-                        FontAttributes="Bold"
-                        TextColor="{Binding NoKonradColor}">
-                    </Button>
-                    <Button
-                        x:Name="TINKButton"
-                        AutomationId ="FilterTINK_button"
-                        Text="{x:Static resources:AppResources.MarkingCargoBike}"
-                        Command="{Binding OnToggleKonradToTink}"
-                        IsVisible="{Binding IsToggleVisible}"
-                        BackgroundColor="{Binding TinkColor}"
-                        BorderColor="{Binding TinkColor}"
-                        BorderWidth="0"
-                        VerticalOptions="Center"
-                        HorizontalOptions="Center"
-                        WidthRequest="94"
-                        HeightRequest="40"
-                        BorderRadius="10"
-                        Margin="0,0,3,0"
-                        FontSize="Small"
-                        FontAttributes="Bold"
-                        TextColor="{Binding NoTinkColor}">
-                    </Button>
-                </StackLayout>
-            </Frame>
-            <StackLayout
-            Grid.Row="3"
-            Grid.ColumnSpan="3"
-            Margin="6,3,6,6"
-            VerticalOptions="EndAndExpand"
-            Orientation="Horizontal">
-                <Label 
-                    HeightRequest="24" 
-                    FontSize="Small"
-                    Text="{Binding StatusInfoText}"
-                    TextColor="White"
-                    VerticalOptions="Center"
-                    HorizontalOptions="FillAndExpand"/>
-                <ActivityIndicator IsRunning="{Binding IsRunning}"
-                         IsVisible="{Binding IsRunning}"
-                          HeightRequest="20"
-                          VerticalOptions="CenterAndExpand"
-                          HorizontalOptions="End">
-                    <ActivityIndicator.WidthRequest>
-                        <OnPlatform x:TypeArguments="x:Double" iOS="40" Android="40" WinPhone="40" />
-                    </ActivityIndicator.WidthRequest>
-                    <ActivityIndicator.Color>
-                        <OnPlatform x:TypeArguments="Color"
-                      Android="White" iOS="White" WinPhone="White"/>
-                    </ActivityIndicator.Color>
-                </ActivityIndicator>
-            </StackLayout>
-    </Grid>
-</ContentPage>
+	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:maps="clr-namespace:Xamarin.Forms.GoogleMaps;assembly=Xamarin.Forms.GoogleMaps"
+	xmlns:bindings="clr-namespace:Xamarin.Forms.GoogleMaps.Bindings;assembly=Xamarin.Forms.GoogleMaps.Bindings"
+	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+	x:Class="TINK.View.Map.MapPage"
+	BackgroundColor="{DynamicResource Key=primary-back-title-color}">
+	
+	<Shell.TitleView>
+		<Grid ColumnDefinitions="Auto, 1*">
+			<Image Style="{StaticResource Image-Navbar}"/>
+			<Label Style="{StaticResource Label-Navbar}"
+				Text="{x:Static resources:AppResources.MarkingMapPage}"/>
+		</Grid>
+	</Shell.TitleView>
+
+	<!--Grid for Map with Buttons and Running process-->
+	<Grid
+		RowDefinitions="3,46,1*,Auto"
+		ColumnDefinitions="1*,Auto,1*"
+		IsEnabled="{Binding IsMapPageEnabled}"
+		VerticalOptions="FillAndExpand">
+
+		<!--Map-->
+		<maps:Map
+			Grid.RowSpan="3"
+			Grid.ColumnSpan="3"
+			WidthRequest="320"
+			HeightRequest="800"
+			x:Name="MyMap"
+			IsShowingUser="False"
+			MapType="Street">
+			<maps:Map.Behaviors>
+				<bindings:BindingPinsBehavior Value="{Binding Pins}"/>
+				<bindings:PinClickedToCommandBehavior Command="{Binding PinClickedCommand}"/>
+			</maps:Map.Behaviors>
+		</maps:Map>
+
+		<!--Buttons for choosing bike type-->
+		<Frame
+			CornerRadius="13"
+			Grid.Row="1"
+			Grid.Column="1"
+			Margin="0"
+			Padding="0"
+			BackgroundColor="{DynamicResource secondary-back-title-color}">
+			<StackLayout
+			Orientation="Horizontal"
+			Margin="0"
+			Padding="0">
+				<Button
+				x:Name="KonradButton"
+				AutomationId ="FilterKonrad_button"                    
+				Text="{x:Static resources:AppResources.MarkingCityBike}"
+				Command="{Binding OnToggleTinkToKonrad}" 
+				IsVisible="{Binding IsToggleVisible}"
+				BackgroundColor="{Binding KonradColor}"
+				BorderColor="{Binding KonradColor}"
+				BorderWidth="0"
+				VerticalOptions="Center"
+				HorizontalOptions="Center"
+				WidthRequest="94"
+				HeightRequest="40"
+				BorderRadius="10"
+				Margin="3,0,0,0"
+				FontSize="Small"
+				FontAttributes="Bold"
+				TextColor="{Binding NoKonradColor}">
+				</Button>
+				<Button
+				x:Name="TINKButton"
+				AutomationId ="FilterTINK_button"
+				Text="{x:Static resources:AppResources.MarkingCargoBike}"
+				Command="{Binding OnToggleKonradToTink}"
+				IsVisible="{Binding IsToggleVisible}"
+				BackgroundColor="{Binding TinkColor}"
+				BorderColor="{Binding TinkColor}"
+				BorderWidth="0"
+				VerticalOptions="Center"
+				HorizontalOptions="Center"
+				WidthRequest="94"
+				HeightRequest="40"
+				BorderRadius="10"
+				Margin="0,0,3,0"
+				FontSize="Small"
+				FontAttributes="Bold"
+				TextColor="{Binding NoTinkColor}">
+				</Button>
+			</StackLayout>
+		</Frame>
+
+		<!--While process is running-->
+		<!--Spinner-->
+		<ActivityIndicator
+			Grid.RowSpan="4"
+			Grid.ColumnSpan="3"
+			IsRunning="{Binding IsRunning}"
+			IsVisible="{Binding IsRunning}"
+			Scale="2"
+			VerticalOptions="CenterAndExpand"
+			HorizontalOptions="CenterAndExpand"
+			Color="{x:DynamicResource primary-back-title-color}"/>
+
+		<!--Info text-->
+		<Label
+			Grid.Row="3"
+			Grid.ColumnSpan="3"
+			Text="{Binding StatusInfoText}"
+			TextColor="White"
+			FontSize="Small"
+			HorizontalOptions="Center"
+			Padding="0,0,0,10"/>
+
+	</Grid>
+</ContentPage>