Version 3.0.366

TINK/TINK.Android/Properties/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.365" android:versionCode="365">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.366" android:versionCode="366">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->

TINK/TINK.iOS/Info.plist

@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>365</string>
+	<string>366</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.365</string>
+	<string>3.0.366</string>
 </dict>
 </plist>

TINK/TINK/View/FindBike/FindBikePage.xaml

@@ -3,6 +3,7 @@
 	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"
@@ -18,6 +19,7 @@
 	<ContentPage.Resources>
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
+			<conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -26,56 +28,71 @@
 		<!--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,0,20,0">
 
-					<!--Search bike-->
-					<Frame
-						Padding="10"
-						Margin="0,10,0,5"
-						IsVisible="{Binding IsSelectBikeVisible}"
-						HorizontalOptions="FillAndExpand"
-						BackgroundColor="White">
+						<Grid
+							RowDefinitions="Auto,Auto"
+							ColumnDefinitions="*,Auto">
 
-						<StackLayout 
-						Padding="20">
-
-							<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 
@@ -87,19 +104,19 @@
 						<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>
-					
+
 				</StackLayout>
 
 				<!--Info text-->