Version 3.0.370

Meinkonrad/TINK/View/FindBike/FindBikePage.xaml

@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+<ContentPage
+	xmlns="http://xamarin.com/schemas/2014/forms"
 	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+	xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
 	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"
+	xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
+	xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
 	BackgroundColor="{DynamicResource background-color}">
 
 	<Shell.TitleView>
@@ -19,6 +23,15 @@
 		<ResourceDictionary>
 			<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
 			<conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
+			<xct:MultiConverter x:Key="RentalProcessToVisibleConverter">
+				<xct:EnumToBoolConverter>
+					<xct:EnumToBoolConverter.TrueValues>
+						<rental_process:CurrentRentalProcess>CloseLock</rental_process:CurrentRentalProcess>
+						<rental_process:CurrentRentalProcess>EndRental</rental_process:CurrentRentalProcess>
+					</xct:EnumToBoolConverter.TrueValues>
+				</xct:EnumToBoolConverter>
+				<xct:InvertedBoolConverter />
+			</xct:MultiConverter>
 		</ResourceDictionary>
 	</ContentPage.Resources>
 
@@ -29,9 +42,10 @@
 
 			<!-- Grid for Content -->
 			<Grid
-				RowDefinitions="1*,Auto"
+				IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
+				Grid.Row="0"
 				RowSpacing="0"
-				Grid.Row="0">
+				RowDefinitions="1*,Auto">
 
 				<StackLayout
 					Grid.Row="0"
@@ -40,37 +54,7 @@
 
 					<StackLayout
 						BackgroundColor="White"
-						Padding="20,5,20,0">
-
-						<!--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>
+						Padding="20,0,20,0">
 
 						<Grid
 							RowDefinitions="Auto,Auto"
@@ -171,6 +155,14 @@
 				Grid.Row="0"
 				IsVisible="{Binding IsProcessWithRunningProcessView}"/>
 
+			<!--CloseLock View-->
+			<bikeRentalProcess:RentalProcessBookedOpenCloseLock
+				Grid.Row="0"/>
+
+			<!--EndRental View-->
+			<bikeRentalProcess:RentalProcessBookedClosedEndRental
+				Grid.Row="0"/>
+
 		</Grid>
 
 	</ContentPage.Content>

Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs

@@ -4,6 +4,7 @@ using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using TINK.Model.Device;
+using TINK.MultilingualResources;
 using TINK.ViewModel.FindBike;
 using Xamarin.CommunityToolkit.Extensions;
 using Xamarin.Forms;
@@ -64,7 +65,10 @@ namespace TINK.View.FindBike
 			catch (Exception exception)
 			{
 				Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
-				await DisplayAlert("Fehler", $"Seite Fahrrad Wählen kann nicht angezeigt werden. ${exception.Message}", "OK");
+				await DisplayAlert(
+					AppResources.ErrorPageNotLoadedTitle,
+					$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
+					AppResources.MessageAnswerOk);
 				return;
 
 			}