Version 3.0.366

Meinkonrad/TINK/View/FindBike/FindBikePage.xaml

@@ -2,6 +2,7 @@
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
 	x:Class="TINK.View.FindBike.FindBikePage"
+	xmlns:conv="clr-namespace:TINK.View"
 	xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
 	xmlns:local_bike="clr-namespace:TINK.View.Bike"
 	xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
@@ -17,6 +18,7 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -25,56 +27,101 @@
 		<!--Grid for Bike(s) view and Running process in same row-->
 		<Grid>
 
+			<!-- Grid for Content -->
 			<Grid
-					RowDefinitions="1*,Auto"
+				RowDefinitions="1*,Auto"
 				RowSpacing="0"
-					Grid.Row="0">
+				Grid.Row="0">
 
 				<StackLayout
-						Grid.Row="0"
-						Spacing="0"
-						Orientation="Vertical">
+					Grid.Row="0"
+					Spacing="0"
+					Orientation="Vertical">
 
-					<!--No Network Connection-->
-					<sharedGui:NotConnectedToNetView/>
+					<StackLayout
+						BackgroundColor="White"
+						Padding="20,5,20,0">
 
-					<!--Search bike-->
-					<Frame
-						Padding="10"
-						Margin="0,10,0,5"
-						IsVisible="{Binding IsSelectBikeVisible}"
-						HorizontalOptions="FillAndExpand"
-						BackgroundColor="White">
+						<!--Bike type-->
+						<StackLayout Orientation="Horizontal"
+									 HorizontalOptions="Center"
+									 IsVisible="{Binding ActiveFilteredBikeType, Converter={StaticResource Label_Converter}}"
+									 Spacing="0">
+							<Label
+								TextColor="DimGray"
+								Text="{x:Static resources:AppResources.MarkingFindBikeTypeOfBikeText}"/>
+							<Label
+								TextColor="{DynamicResource primary-back-title-color}"
+								FontAttributes="Bold"
+								Text="{Binding ActiveFilteredBikeType}"/>
+							<Button
+								Command="{Binding ShowFilterBikeTypeInfoCommand}"
+								WidthRequest="24"
+								HeightRequest="24"
+								BackgroundColor="Transparent"
+								BorderWidth="0"
+								Padding="0"
+								Margin="5,0,0,0">
+								<Button.ImageSource>
+									<FontImageSource
+									Glyph="{StaticResource InfoCircle}"
+									Color="DimGray"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Button.ImageSource>
+							</Button>
+						</StackLayout>
 
-						<StackLayout 
-						Padding="20">
+						<Grid
+							RowDefinitions="Auto,Auto"
+							ColumnDefinitions="*,Auto">
 
-							<Label Text="{x:Static resources:AppResources.MarkingFindBikeLabel}"
-                               Margin="0,0,0,-5">
+							<!--Search bike-->
+							<Label
+								Grid.Column="0"
+								Grid.ColumnSpan="2"
+								Grid.Row="0"
+								Text="{x:Static resources:AppResources.MarkingFindBikeLabel}"
+								Margin="0,5,0,-5">
 								<Label.Triggers>
 									<DataTrigger
-                                        TargetType="Label"
-                                        Binding="{Binding Source={x:Reference FindBikeEntry}, Path=Text, TargetNullValue=''}"
-                                        Value="">
+										TargetType="Label"
+										Binding="{Binding Source={x:Reference FindBikeEntry}, Path=Text, TargetNullValue=''}"
+										Value="">
 										<Setter Property="IsVisible" Value="False" />
 									</DataTrigger>
 								</Label.Triggers>
 							</Label>
 							<Entry
+								Grid.Column="0"
+								Grid.Row="1"
 								x:Name="FindBikeEntry"
 								Placeholder="{x:Static resources:AppResources.PlaceholderFindBike}"
 								MaxLength="10"
 								CursorPosition="0"
-								Text="{Binding BikeIdUserInput}"/>
+								Text="{Binding BikeIdUserInput, Mode=TwoWay}"/>
 
 							<Button
-								Text="{x:Static resources:AppResources.MarkingSearchBike}"
+								Grid.Column="1"
+								Grid.Row="1"
+								WidthRequest="100"
+								Text="{x:Static resources:AppResources.MarkingFindBikeButton}"
 								IsEnabled="{Binding IsSelectBikeEnabled}"
 								Command="{Binding OnSelectBikeRequest}"/>
 
-						</StackLayout>
+						</Grid>
 
-					</Frame>
+						<!--Line-->
+						<BoxView
+							HeightRequest="1"
+							WidthRequest="400"
+							HorizontalOptions="Center"
+							Color="{DynamicResource primary-back-title-color}"/>
+
+					</StackLayout>
+
+					<!--No Network Connection-->
+					<sharedGui:NotConnectedToNetView/>
 
 					<!-- Bike -->
 					<StackLayout 
@@ -86,16 +133,16 @@
 						<sharedGui:HintForRefreshingPageView/>
 
 						<ListView 
-								x:Name="FindBikeListView"
-								SelectionMode="None"
-								SelectedItem="{Binding SelectedBike}"
-								IsEnabled="{Binding IsIdle}"                
-								HasUnevenRows="True"
-								SeparatorVisibility="None"
-								ItemTemplate="{StaticResource bikeTemplateSelector}"
-								IsPullToRefreshEnabled="True"
-								RefreshCommand="{Binding RefreshCommand}"
-								IsRefreshing="{Binding IsRefreshing}"/>
+							x:Name="FindBikeListView"
+							SelectionMode="None"
+							SelectedItem="{Binding SelectedBike}"
+							IsEnabled="{Binding IsIdle}"
+							HasUnevenRows="True"
+							SeparatorVisibility="None"
+							ItemTemplate="{StaticResource bikeTemplateSelector}"
+							IsPullToRefreshEnabled="True"
+							RefreshCommand="{Binding RefreshCommand}"
+							IsRefreshing="{Binding IsRefreshing}"/>
 
 					</StackLayout>