mirror of
https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code
synced 2024-05-12 04:56:35 +02:00
Version 3.0.376
This commit is contained in:
Anja
parent
ca080c87c0
commit
f963c0a219
|
|
@ -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.TeilRad.LastenradBayern" android:versionName="3.0.375" android:versionCode="375">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.376" android:versionCode="376">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace TINK.Droid
|
|||
{
|
||||
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
|
||||
public partial class Resource
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>LastenradBayern</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>375</string>
|
||||
<string>376</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.375</string>
|
||||
<string>3.0.376</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
<ResourceDictionary>
|
||||
<xct:InvertedBoolConverter x:Key="InvertedBoolConverter" />
|
||||
<x:String x:Key="IconMap"></x:String>
|
||||
<x:String x:Key="IconFindBike"></x:String>
|
||||
<x:String x:Key="IconSelectBike"></x:String>
|
||||
<x:String x:Key="IconMyBikes"></x:String>
|
||||
<x:String x:Key="IconAccount"></x:String>
|
||||
<x:String x:Key="IconLogin"></x:String>
|
||||
<x:String x:Key="IconSettings"></x:String>
|
||||
<x:String x:Key="IconFeesAndBikes"></x:String>
|
||||
<!--<x:String x:Key="IconFeesAndBikes"></x:String>-->
|
||||
<x:String x:Key="IconHelp"></x:String>
|
||||
<!--<x:String x:Key="IconHelp"></x:String>-->
|
||||
<x:String x:Key="IconContact"></x:String>
|
||||
<!--<x:String x:Key="IconContact"></x:String>-->
|
||||
<x:String x:Key="IconInfo"></x:String>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
<DependentUpon>ILockItBike.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\BoolInverterConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Contact\SelectStationPage.xaml.cs">
|
||||
<DependentUpon>SelectStationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -36,11 +35,10 @@
|
|||
<DependentUpon>FeedbackPopup.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml.cs">
|
||||
<DependentUpon>FindBikePage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml.cs">
|
||||
<DependentUpon>SelectBikePage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ListViewAttachedBehavior.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\MiniSurvey\MiniSurveyPage.xaml.cs">
|
||||
<DependentUpon>MiniSurveyPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -61,11 +59,10 @@
|
|||
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
|
||||
<DependentUpon>AppShell.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\StringNotNullOrEmptyToVisibleConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ViewTypesTypeProvider.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Model\Device\SpecialFolder.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml.cs">
|
||||
<DependentUpon>FeesAndBikesPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml.cs">
|
||||
<DependentUpon>HelpPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\CopriWebView\ManageAccountPage.xaml.cs">
|
||||
|
|
@ -80,8 +77,8 @@
|
|||
<DependentUpon>PasswordForgottenPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml.cs">
|
||||
<DependentUpon>AgbPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml.cs">
|
||||
<DependentUpon>GtcPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\WhatsNewPage.xaml.cs">
|
||||
|
|
@ -97,8 +94,8 @@
|
|||
<DependentUpon>ContactPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml.cs">
|
||||
<DependentUpon>InfoTabbedPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml.cs">
|
||||
<DependentUpon>LegalInformationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Login\LoginPage.xaml.cs">
|
||||
|
|
@ -161,7 +158,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\BikesAtStation\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Help\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Login\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Map\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\MyBikes\" />
|
||||
|
|
@ -174,13 +171,13 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -192,7 +189,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -246,7 +243,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Contact.ContactPage">
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ using System;
|
|||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.Contact;
|
||||
using Xamarin.Essentials;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
|
|
|||
59
LastenradBayern/TINK/View/Help/HelpPage.xaml
Normal file
59
LastenradBayern/TINK/View/Help/HelpPage.xaml
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Help.HelpPage">
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingHelp}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
<!--Pages can be added as references or inline-->
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabManual}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="ManualWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding ManualHtml}"/>
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabTariffs}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="TariffsWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding TariffsHtml}"/>
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</TabbedPage>
|
||||
54
LastenradBayern/TINK/View/Help/HelpPage.xaml.cs
Normal file
54
LastenradBayern/TINK/View/Help/HelpPage.xaml.cs
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
using System.Globalization;
|
||||
using Serilog;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.Help;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Help
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class HelpPage : TabbedPage
|
||||
{
|
||||
public HelpPageViewModel ViewModel { get; }
|
||||
|
||||
public HelpPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
|
||||
/// Info about renting.
|
||||
TariffsWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
TariffsWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Mietinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
/// Info about types of bikes.
|
||||
ManualWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
ManualWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Radinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
ViewModel = new HelpPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.TariffsResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ManualResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
|
||||
this.BindingContext = ViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Called when page is shown. </summary>
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
ViewModel.OnAppearing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<CarouselPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.Info.BikeInfo.BikeInfoCarouselPage">
|
||||
<CarouselPage.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<ContentPage>
|
||||
<ContentPage.Padding>
|
||||
<OnPlatform x:TypeArguments="Thickness">
|
||||
<On Platform="iOS" Value="0,40,0,0" />
|
||||
</OnPlatform>
|
||||
</ContentPage.Padding>
|
||||
<ScrollView Orientation="Vertical">
|
||||
<StackLayout>
|
||||
<Label
|
||||
Text="{Binding Title}"
|
||||
FontSize="Medium"
|
||||
HorizontalOptions="Center"
|
||||
HorizontalTextAlignment="Center"
|
||||
VerticalOptions="EndAndExpand"
|
||||
VerticalTextAlignment="End"/>
|
||||
<Image
|
||||
IsVisible="{Binding IsImageVisble}"
|
||||
Source="{Binding Image}"
|
||||
Aspect="AspectFit"
|
||||
HorizontalOptions="FillAndExpand"
|
||||
VerticalOptions="FillAndExpand"/>
|
||||
<Label
|
||||
Text="{Binding DescriptionText}"
|
||||
HorizontalOptions="Center"
|
||||
HorizontalTextAlignment="Center"
|
||||
VerticalOptions="StartAndExpand"
|
||||
VerticalTextAlignment="Start"/>
|
||||
<Button
|
||||
Text="Schließen"
|
||||
IsVisible="{Binding IsCloseVisible}"
|
||||
Command="{Binding OnCloseRequest}"
|
||||
VerticalOptions="End"/>
|
||||
<ProgressBar
|
||||
VerticalOptions="End"
|
||||
Progress="{Binding ProgressValue}"/>
|
||||
</StackLayout>
|
||||
</ScrollView>
|
||||
</ContentPage>
|
||||
</DataTemplate>
|
||||
</CarouselPage.ItemTemplate>
|
||||
</CarouselPage>
|
||||
|
|
@ -0,0 +1,105 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.LegalInformation.LegalInformationPage">
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingLegalInformation}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
<!--Pages can be added as references or inline-->
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabApp}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="InfoLicenses"
|
||||
Source="{Binding AppHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabPrivacy}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="PrivacyWebView"
|
||||
Source="{Binding PrivacyHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabGtc}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="GtcWebView"
|
||||
Source ="{Binding GtcHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabImpress}">
|
||||
<ContentPage.Content>
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
<WebView
|
||||
x:Name="ImpressWebView"
|
||||
Source="{Binding ImpressHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<ActivityIndicator Grid.Row="0"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</TabbedPage>
|
||||
|
|
@ -1,30 +1,30 @@
|
|||
using System.Globalization;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Info
|
||||
namespace TINK.View.LegalInformation
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class InfoPage : TabbedPage
|
||||
public partial class LegalInformationPage : TabbedPage
|
||||
{
|
||||
public InfoPageViewModel ViewModel { get; }
|
||||
public LegalInformationPageViewModel ViewModel { get; }
|
||||
|
||||
public InfoPage()
|
||||
public LegalInformationPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
ViewModel = new InfoPageViewModel(
|
||||
ViewModel = new LegalInformationPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.AgbResourcePath,
|
||||
App.ModelRoot.ResourceUrls.GtcResourcePath,
|
||||
App.ModelRoot.ResourceUrls.PrivacyResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ImpressResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
resourceName => ViewModelResourceHelper.GetSource(resourceName),
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
TabbedInfoPage.BindingContext = ViewModel;
|
||||
this.BindingContext = ViewModel;
|
||||
|
||||
InfoLicenses.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoLicenses.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
|
|
@ -32,20 +32,20 @@ namespace TINK.View.Info
|
|||
ev,
|
||||
"<html><b>Kann Lizenzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
InfoDatenschutz.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoDatenschutz.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
PrivacyWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
PrivacyWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Datenschutzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
InfoABG.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoABG.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
GtcWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
GtcWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann allgemeine Geschäftsbedingungen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
InfoImpressum.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoImpressum.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
ImpressWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
ImpressWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Impressum nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingMapPage}"/>
|
||||
Text="{x:Static resources:AppResources.MarkingBikeLocations}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:mappage="clr-namespace:TINK.View.Map"
|
||||
xmlns:findbike="clr-namespace:TINK.View.FindBike"
|
||||
xmlns:findbike="clr-namespace:TINK.View.SelectBike"
|
||||
xmlns:mybikes="clr-namespace:TINK.View.MyBikes"
|
||||
xmlns:account="clr-namespace:TINK.View.Account"
|
||||
xmlns:login="clr-namespace:TINK.View.Login"
|
||||
xmlns:settings="clr-namespace:TINK.View.Settings"
|
||||
xmlns:contact="clr-namespace:TINK.View.Contact"
|
||||
xmlns:info="clr-namespace:TINK.View.Info"
|
||||
xmlns:info="clr-namespace:TINK.View.LegalInformation"
|
||||
xmlns:help="clr-namespace:TINK.View.Help"
|
||||
xmlns:header="clr-namespace:TINK.View.RootShell"
|
||||
xmlns:version="clr-namespace:ShareeSharedGuiLib.View"
|
||||
BackgroundColor="{DynamicResource Key=primary-back-title-color}"
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingMapPage}"
|
||||
Title="{x:Static resources:AppResources.MarkingBikeLocations}"
|
||||
Route="MapPage"
|
||||
ContentTemplate="{DataTemplate mappage:MapPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -31,11 +32,11 @@
|
|||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFindBike}"
|
||||
IsVisible="{Binding IsFindBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:FindBikePage}">
|
||||
Title="{x:Static resources:AppResources.MarkingSelectBike}"
|
||||
IsVisible="{Binding IsSelectBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:SelectBikePage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFindBike}" Color="Black" FontFamily="FA-S" />
|
||||
<FontImageSource Glyph="{StaticResource IconSelectBike}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
|
|
@ -70,27 +71,18 @@
|
|||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingSettings}"
|
||||
ContentTemplate="{DataTemplate settings:SettingsPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconSettings}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconSettings}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeesAndBikes}"
|
||||
ContentTemplate="{DataTemplate contact:FeesAndBikesPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFeesAndBikes}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}"
|
||||
Title="{x:Static resources:AppResources.MarkingContact}"
|
||||
Route="ContactPage"
|
||||
ContentTemplate="{DataTemplate contact:ContactPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -98,10 +90,19 @@
|
|||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingHelp}"
|
||||
ContentTemplate="{DataTemplate help:HelpPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconHelp}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{Binding TabbedPageIngoTitle}"
|
||||
ContentTemplate="{DataTemplate info:InfoPage}">
|
||||
Title="{x:Static resources:AppResources.MarkingLegalInformation}"
|
||||
ContentTemplate="{DataTemplate info:LegalInformationPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconInfo}" Color="Black" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
|
|
|
|||
67
LastenradBayern/TINK/View/SelectBike/SelectBikePage.xaml
Normal file
67
LastenradBayern/TINK/View/SelectBike/SelectBikePage.xaml
Normal file
|
|
@ -0,0 +1,67 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.SelectBike.SelectBikePage"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:local_bike="clr-namespace:TINK.View.Bike"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBike}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
<ContentPage.Resources>
|
||||
<ResourceDictionary>
|
||||
<local_bike:BikeViewCellTemplateSelector x:Key="bikeTemplateSelector"/>
|
||||
</ResourceDictionary>
|
||||
</ContentPage.Resources>
|
||||
|
||||
<ContentPage.Content>
|
||||
|
||||
<Frame>
|
||||
|
||||
<!--Grid for Bike(s) view and Running process in same row-->
|
||||
<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
</Grid.RowDefinitions>
|
||||
|
||||
<!--Search bike-->
|
||||
<StackLayout Grid.Row="0">
|
||||
<Entry
|
||||
Placeholder="{x:Static resources:AppResources.PlaceholderSelectBike}"
|
||||
IsVisible="{Binding IsSelectBikeVisible}"
|
||||
MaxLength="10"
|
||||
CursorPosition="0"
|
||||
Text="{Binding BikeIdUserInput}"/>
|
||||
|
||||
<Button
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBike}"
|
||||
IsEnabled="{Binding IsSelectBikeEnabled}"
|
||||
IsVisible="{Binding IsSelectBikeVisible}"
|
||||
Command="{Binding OnSelectBikeRequest}"/>
|
||||
|
||||
<ListView
|
||||
x:Name="SelectBikeListView"
|
||||
SelectionMode="None"
|
||||
SelectedItem="{Binding SelectedBike}"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
IsVisible="{Binding IsBikesListVisible}"
|
||||
HasUnevenRows="True"
|
||||
ItemTemplate="{StaticResource bikeTemplateSelector}"/>
|
||||
|
||||
</StackLayout>
|
||||
|
||||
<!--While process is running-->
|
||||
<sharedGui:RunningProcessViewBay
|
||||
Grid.Row="0"
|
||||
IsVisible="{Binding IsProcessWithRunningProcessView}"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
</Frame>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
183
LastenradBayern/TINK/View/SelectBike/SelectBikePage.xaml.cs
Normal file
183
LastenradBayern/TINK/View/SelectBike/SelectBikePage.xaml.cs
Normal file
|
|
@ -0,0 +1,183 @@
|
|||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Serilog;
|
||||
using TINK.Model;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
using TINK.MultilingualResources;
|
||||
using TINK.ViewModel.SelectBike;
|
||||
using Xamarin.CommunityToolkit.Extensions;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.SelectBike
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class SelectBikePage : ContentPage, IViewService
|
||||
{
|
||||
/// <summary> Reference to view model. </summary>
|
||||
SelectBikePageViewModel m_oViewModel = null;
|
||||
|
||||
/// <summary>
|
||||
/// Holds a value indicating whether page already subscribed to shell item changes or not.
|
||||
/// </summary>
|
||||
private bool _IsShellItemChangedReceived = false;
|
||||
|
||||
public SelectBikePage() { }
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when page is shown.
|
||||
/// Starts update process.
|
||||
/// </summary>
|
||||
protected async override void OnAppearing()
|
||||
{
|
||||
if (m_oViewModel != null)
|
||||
{
|
||||
// No need to create view model, set binding context an items source if already done.
|
||||
// If done twice tap events are fired multiple times (when hiding page using home button).
|
||||
await m_oViewModel.OnAppearingOrRefresh();
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var model = App.ModelRoot;
|
||||
|
||||
m_oViewModel = new SelectBikePageViewModel(
|
||||
model.ActiveUser,
|
||||
model,
|
||||
App.PermissionsService,
|
||||
App.BluetoothService,
|
||||
Device.RuntimePlatform,
|
||||
() => model.GetIsConnected(),
|
||||
(isConnected) => model.GetConnector(isConnected),
|
||||
App.LocationServicesContainer.Active,
|
||||
model.LocksServices.Active,
|
||||
model.Stations,
|
||||
model.Polling,
|
||||
model.PostAction,
|
||||
model.SmartDevice,
|
||||
this,
|
||||
(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
|
||||
{
|
||||
IsReportLevelVerbose = model.IsReportLevelVerbose
|
||||
};
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Log.ForContext<SelectBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
|
||||
await DisplayAlert(
|
||||
AppResources.ErrorPageNotLoadedTitle,
|
||||
$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
|
||||
AppResources.MessageAnswerOk);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
InitializeComponent();
|
||||
|
||||
BindingContext = m_oViewModel;
|
||||
SelectBikeListView.ItemsSource = m_oViewModel;
|
||||
|
||||
await m_oViewModel.OnAppearingOrRefresh();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when page is disappearing to
|
||||
/// - stop the update process
|
||||
/// - to subscribe to events.
|
||||
/// </summary>
|
||||
protected async override void OnDisappearing()
|
||||
{
|
||||
if (!_IsShellItemChangedReceived && Shell.Current != null)
|
||||
{
|
||||
// Subscribe to events.
|
||||
// Do not do this on startup because Shell.Current is null, if FindeBikePage is startup page.
|
||||
Shell.Current.Navigated += (sender, e) =>
|
||||
{
|
||||
if (e.Source != ShellNavigationSource.ShellItemChanged)
|
||||
{
|
||||
// Nothing to do.
|
||||
return;
|
||||
}
|
||||
|
||||
// Reset previous user input after switch of pages to allow user to select a differnt bike if one has been selected before.
|
||||
m_oViewModel.BikeIdUserInput = String.Empty;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
_IsShellItemChangedReceived = true;
|
||||
|
||||
await (m_oViewModel?.OnDisappearing() ?? Task.CompletedTask);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Displays alert message.
|
||||
/// </summary>
|
||||
/// <param name="p_strTitle">Title of message.</param>
|
||||
/// <param name="p_strMessage">Message to display.</param>
|
||||
/// <param name="p_strCancel">Type of buttons.</param>
|
||||
public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="cancel">Type of buttons.</param>
|
||||
public async Task DisplayAdvancedAlert(
|
||||
string title,
|
||||
string message,
|
||||
string details,
|
||||
string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
|
||||
|
||||
/// <summary> Displays detailed alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="accept">Text of accept button.</param>
|
||||
/// <param name="cancel">Text of cancel button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
|
||||
|
||||
/// <summary>
|
||||
/// Displays alert message.
|
||||
/// </summary>
|
||||
/// <param name="p_strTitle">Title of message.</param>
|
||||
/// <param name="p_strMessage">Message to display.</param>
|
||||
/// <param name="p_strAccept">Text of accept button.</param>
|
||||
/// <param name="p_strCancel">Text of button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
|
||||
|
||||
/// <summary> Shows a page.</summary>
|
||||
/// <param name="route">Route of the page to show.</param>
|
||||
public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
|
||||
|
||||
/// <summary> Pushes a page onto the modal stack. </summary>
|
||||
/// <param name="typeOfPage">Page to display.</param>
|
||||
public async Task PushModalAsync(ViewTypes typeOfPage)
|
||||
=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
|
||||
|
||||
/// <summary> Pops a page from the modal stack. </summary>
|
||||
public Task PopModalAsync() => throw new NotSupportedException();
|
||||
|
||||
/// <summary> Pushes a page onto the stack. </summary>
|
||||
/// <param name="p_oTypeOfPage">Page to display.</param>
|
||||
public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
|
||||
|
||||
#if USCSHARP9
|
||||
public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
|
||||
#else
|
||||
/// <summary> Displays user feedback popup.</summary>
|
||||
/// <param name="co2Saving"> Co2 saving information.</param>
|
||||
/// <returns>User feedback.</returns>
|
||||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -2,14 +2,15 @@ using System;
|
|||
using TINK.View.BikesAtStation;
|
||||
using TINK.View.Contact;
|
||||
using TINK.View.CopriWebView;
|
||||
using TINK.View.Info;
|
||||
using TINK.View.LegalInformation;
|
||||
using TINK.View.Help;
|
||||
using TINK.View.Login;
|
||||
using TINK.View.Map;
|
||||
using TINK.View.MiniSurvey;
|
||||
using TINK.View.MyBikes;
|
||||
using TINK.View.Settings;
|
||||
using TINK.View.WhatsNew;
|
||||
using TINK.View.WhatsNew.Agb;
|
||||
using TINK.View.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace TINK.View
|
||||
|
|
@ -38,17 +39,17 @@ namespace TINK.View
|
|||
case ViewTypes.SettingsPage:
|
||||
return typeof(SettingsPage);
|
||||
|
||||
case ViewTypes.TabbedPageInfo:
|
||||
return typeof(InfoPage);
|
||||
case ViewTypes.LegalInformationPage:
|
||||
return typeof(LegalInformationPage);
|
||||
|
||||
case ViewTypes.FeesAndBikesPage:
|
||||
return typeof(FeesAndBikesPage);
|
||||
case ViewTypes.HelpPage:
|
||||
return typeof(HelpPage);
|
||||
|
||||
case ViewTypes.ManageAccountPage:
|
||||
return typeof(ManageAccountPage);
|
||||
|
||||
case ViewTypes.AgbPage:
|
||||
return typeof(AgbPage);
|
||||
case ViewTypes.GtcPage:
|
||||
return typeof(GtcPage);
|
||||
|
||||
case ViewTypes.WhatsNewPage:
|
||||
return typeof(WhatsNewPage);
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.WhatsNew.Agb.AgbPage">
|
||||
x:Class="TINK.View.WhatsNew.Gtc.GtcPage">
|
||||
<ContentPage.Content>
|
||||
<Frame>
|
||||
<StackLayout>
|
||||
<WebView
|
||||
HeightRequest="1000"
|
||||
WidthRequest="500"
|
||||
Source="{Binding InfoAgb}"/>
|
||||
Source="{Binding GtcHtml}"/>
|
||||
<Button
|
||||
Text="OK"
|
||||
WidthRequest="100"
|
||||
|
|
@ -18,4 +18,4 @@
|
|||
</Frame>
|
||||
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</ContentPage>
|
||||
|
|
@ -3,26 +3,26 @@ using System.Globalization;
|
|||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.WhatsNew.Agb;
|
||||
using TINK.ViewModel.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.WhatsNew.Agb
|
||||
namespace TINK.View.WhatsNew.Gtc
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class AgbPage : ContentPage, IViewService
|
||||
public partial class GtcPage : ContentPage, IViewService
|
||||
{
|
||||
public AgbPage()
|
||||
public GtcPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
agbViewModel = new AgbViewModel(
|
||||
gtcViewModel = new GtcViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
(resourceName) => ViewModelResourceHelper.GetSource(resourceName),
|
||||
this);
|
||||
|
||||
BindingContext = agbViewModel;
|
||||
BindingContext = gtcViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
|
|
@ -49,10 +49,10 @@ namespace TINK.View.WhatsNew.Agb
|
|||
|
||||
/// <summary> Invoked when page is shown. </summary>
|
||||
protected async override void OnAppearing()
|
||||
=> await agbViewModel.OnAppearing();
|
||||
=> await gtcViewModel.OnAppearing();
|
||||
|
||||
/// <summary> Reference to view model.</summary>
|
||||
AgbViewModel agbViewModel;
|
||||
GtcViewModel gtcViewModel;
|
||||
|
||||
public async Task PopModalAsync()
|
||||
=> await Navigation.PopModalAsync();
|
||||
|
|
@ -3,7 +3,7 @@ using TINK.MultilingualResources;
|
|||
using TINK.Services;
|
||||
using TINK.Services.CopriApi.ServerUris;
|
||||
using TINK.View.Themes;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
|
||||
namespace TINK.ViewModel.RootShell
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@ namespace TINK.ViewModel.RootShell
|
|||
{
|
||||
// Login state changed. Update related menu entries.
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSelectBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
|
||||
};
|
||||
|
|
@ -56,13 +56,13 @@ namespace TINK.ViewModel.RootShell
|
|||
|
||||
public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
public bool IsSelectBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public string TabbedPageIngoTitle => AppResources.MarkingAbout;
|
||||
public string TabbedPageIngoTitle => AppResources.MarkingLegalInformation;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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.TeilRad.Meinkonrad" android:versionName="3.0.375" android:versionCode="375">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.376" android:versionCode="376">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ namespace TINK.Droid
|
|||
{
|
||||
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
|
||||
public partial class Resource
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -1,104 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
using Android.App;
|
||||
using Android.Content;
|
||||
using Android.OS;
|
||||
using Android.Runtime;
|
||||
using Android.Views;
|
||||
using Android.Widget;
|
||||
#if ARENDI
|
||||
using Arendi.BleLibrary;
|
||||
using Arendi.BleLibrary.Adapter;
|
||||
using Arendi.BleLibrary.Android;
|
||||
using Arendi.BleLibrary.Local;
|
||||
using Arendi.BleLibrary.Remote;
|
||||
#endif
|
||||
using Xamarin.Forms;
|
||||
|
||||
[assembly: Dependency(typeof(TINK.Droid.Services.BluetoothLock.Arendi.Central))]
|
||||
namespace TINK.Droid.Services.BluetoothLock.Arendi
|
||||
{
|
||||
#if ARENDI
|
||||
public class Central : ICentral
|
||||
#else
|
||||
public class Central
|
||||
#endif
|
||||
{
|
||||
#if ARENDI
|
||||
private bool disposedValue;
|
||||
|
||||
private static ICentral central = CentralFactory.GetCentral();
|
||||
|
||||
public global::Arendi.BleLibrary.Adapter.IAdapter Adapter => throw new NotImplementedException();
|
||||
|
||||
public BluetoothState BluetoothState => throw new NotImplementedException();
|
||||
|
||||
public ISecurityManager SecurityManager => throw new NotImplementedException();
|
||||
|
||||
public IBondManager BondManager => throw new NotImplementedException();
|
||||
|
||||
public IDictionary<string, string> SystemInformation => throw new NotImplementedException();
|
||||
|
||||
public event EventHandler<PeripheralDiscoveredEventArgs> PeripheralDiscovered;
|
||||
public event EventHandler<BluetoothStateChangedEventArgs> BluetoothStateChanged;
|
||||
public event EventHandler<EventArgs> SystemInformationUpdated;
|
||||
public event EventHandler<FatalErrorEventArgs> FatalError;
|
||||
|
||||
public IPeripheral CreatePeripheralByUuid(Uuid uuid, string name = null)
|
||||
=> central.CreatePeripheralByUuid(uuid, name);
|
||||
|
||||
public bool IsEnabled()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StartScan()
|
||||
=> central.StartScan();
|
||||
|
||||
public void StartScan(string[] uuids)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StartScan(Uuid[] uuids)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StopScan()
|
||||
=> central.StopScan();
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
if (!disposedValue)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
// TODO: dispose managed state (managed objects)
|
||||
}
|
||||
|
||||
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
|
||||
// TODO: set large fields to null
|
||||
disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
// // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
|
||||
// ~Central()
|
||||
// {
|
||||
// // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
|
||||
// Dispose(disposing: false);
|
||||
// }
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
|
||||
Dispose(disposing: true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>Mein konrad</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>375</string>
|
||||
<string>376</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.375</string>
|
||||
<string>3.0.376</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
<ResourceDictionary>
|
||||
<xct:InvertedBoolConverter x:Key="InvertedBoolConverter" />
|
||||
<x:String x:Key="IconMap"></x:String>
|
||||
<x:String x:Key="IconFindBike"></x:String>
|
||||
<x:String x:Key="IconSelectBike"></x:String>
|
||||
<x:String x:Key="IconMyBikes"></x:String>
|
||||
<x:String x:Key="IconAccount"></x:String>
|
||||
<x:String x:Key="IconLogin"></x:String>
|
||||
<x:String x:Key="IconSettings"></x:String>
|
||||
<x:String x:Key="IconFeesAndBikes"></x:String>
|
||||
<x:String x:Key="IconHelp"></x:String>
|
||||
<x:String x:Key="IconContact"></x:String>
|
||||
<x:String x:Key="IconInfo"></x:String>
|
||||
<x:String x:Key="IconClose"></x:String>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!DOCTYPE html
|
||||
<!DOCTYPE html
|
||||
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de">
|
||||
|
|
@ -16,17 +16,21 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
</head>
|
||||
<body>
|
||||
<div class='container'>
|
||||
<div id='Contenttxt'>
|
||||
<div class="content_title2">Version</div>
|
||||
<div style=""></div>
|
||||
<br />Version ACTIVE_APPNAME: <b>CURRENT_VERSION_TINKAPP</b>.
|
||||
<div class="content_title2">Entwickler</div>
|
||||
<div style=""></div>
|
||||
<br />Programmierung ACTIVE_APPNAME: O. Hauff, APPSUPPORTMAILADDRESS<br />
|
||||
<div class="content_title2">Verwendete Bibliotheken</div>
|
||||
<div style=""></div>
|
||||
<br /><table>
|
||||
<div class='container' id='Contenttxt'>
|
||||
<div class="content_title1" style="">
|
||||
<b>ACTIVE_APPNAME</b>
|
||||
</div>
|
||||
<div class="content_title2" style="">
|
||||
Version: CURRENT_VERSION_TINKAPP
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Entwicklung: O. Hauff und A. Müller-Meißner, APPSUPPORTMAILADDRESS
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Verwendete Bibliotheken:<br />
|
||||
<table>
|
||||
<tr><th>Paket </th><th>Lizenz </th></tr>
|
||||
<tr><td>Newtonsoft Json.NET von James Newton-King </td><td><a href="#MITLicense2007">MIT Lizenz 2007</a> </td></tr>
|
||||
<tr><td>PCLCrypto von AArnott </td><td><a href="#MSPL_Long">Microsoft Public License(Ms-PL)</a> </td></tr>
|
||||
|
|
@ -46,9 +50,10 @@
|
|||
<tr><td>Xamarin.Forms.GoogleMaps von amay077 </td><td><a href="#MITLicense2016_2017">MIT Lizenz 2016- 2017</a> </td></tr>
|
||||
<tr><td>Xamarin.Essentials von Microsoft </td><td><a href="#MITLicenseMicrosoft">MIT Lizenz</a> </td></tr>
|
||||
</table>
|
||||
|
||||
<div class="content_title2">Lizenzen</div>
|
||||
<div style=""></div>
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Lizenzen:
|
||||
<article id="ApacheLicense2.0_2004">
|
||||
<div class="content2">
|
||||
<span class='content1'>Apache License</span><br />
|
||||
|
|
@ -665,4 +670,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
<DependentUpon>ILockItBike.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\BoolInverterConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Contact\SelectStationPage.xaml.cs">
|
||||
<DependentUpon>SelectStationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -36,11 +35,10 @@
|
|||
<DependentUpon>FeedbackPopup.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml.cs">
|
||||
<DependentUpon>FindBikePage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml.cs">
|
||||
<DependentUpon>SelectBikePage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ListViewAttachedBehavior.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\MiniSurvey\MiniSurveyPage.xaml.cs">
|
||||
<DependentUpon>MiniSurveyPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -65,11 +63,9 @@
|
|||
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
|
||||
<DependentUpon>AppShell.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\StringNotNullOrEmptyToVisibleConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ViewTypesTypeProvider.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Model\Device\SpecialFolder.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml.cs">
|
||||
<DependentUpon>FeesAndBikesPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml.cs">
|
||||
<DependentUpon>HelpPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\CopriWebView\ManageAccountPage.xaml.cs">
|
||||
|
|
@ -84,14 +80,15 @@
|
|||
<DependentUpon>PasswordForgottenPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml.cs">
|
||||
<DependentUpon>AgbPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ViewTypesTypeProvider.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\WhatsNewPage.xaml.cs">
|
||||
<DependentUpon>WhatsNewPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml.cs">
|
||||
<DependentUpon>GtcPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)ViewModel\ViewModelResourceHelper.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\BikesAtStation\BikesAtStationPage.xaml.cs">
|
||||
<DependentUpon>BikesAtStationPage.xaml</DependentUpon>
|
||||
|
|
@ -101,8 +98,8 @@
|
|||
<DependentUpon>ContactPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml.cs">
|
||||
<DependentUpon>InfoTabbedPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml.cs">
|
||||
<DependentUpon>LegalInformationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Login\LoginPage.xaml.cs">
|
||||
|
|
@ -165,7 +162,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\BikesAtStation\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Help\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Login\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Map\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\MyBikes\" />
|
||||
|
|
@ -178,13 +175,13 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -196,7 +193,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -250,7 +247,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
|
|
@ -1,97 +0,0 @@
|
|||
#if ARENDI
|
||||
using Arendi.BleLibrary;
|
||||
using Arendi.BleLibrary.Adapter;
|
||||
using Arendi.BleLibrary.Local;
|
||||
using Arendi.BleLibrary.Remote;
|
||||
#endif
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace TINK.Services.BluetoothLock.Arendi
|
||||
{
|
||||
#if ARENDI
|
||||
public class Central : ICentral
|
||||
#else
|
||||
public class Central
|
||||
#endif
|
||||
{
|
||||
#if ARENDI
|
||||
private bool disposedValue;
|
||||
|
||||
public IAdapter Adapter => throw new NotImplementedException();
|
||||
|
||||
public BluetoothState BluetoothState => throw new NotImplementedException();
|
||||
|
||||
public ISecurityManager SecurityManager => throw new NotImplementedException();
|
||||
|
||||
public IBondManager BondManager => throw new NotImplementedException();
|
||||
|
||||
public IDictionary<string, string> SystemInformation => throw new NotImplementedException();
|
||||
|
||||
public event EventHandler<PeripheralDiscoveredEventArgs> PeripheralDiscovered;
|
||||
public event EventHandler<BluetoothStateChangedEventArgs> BluetoothStateChanged;
|
||||
public event EventHandler<EventArgs> SystemInformationUpdated;
|
||||
public event EventHandler<FatalErrorEventArgs> FatalError;
|
||||
|
||||
public IPeripheral CreatePeripheralByUuid(Uuid uuid, string name = null)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public bool IsEnabled()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StartScan()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StartScan(string[] uuids)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StartScan(Uuid[] uuids)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
public void StopScan()
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
||||
protected virtual void Dispose(bool disposing)
|
||||
{
|
||||
if (!disposedValue)
|
||||
{
|
||||
if (disposing)
|
||||
{
|
||||
// TODO: dispose managed state (managed objects)
|
||||
}
|
||||
|
||||
// TODO: free unmanaged resources (unmanaged objects) and override finalizer
|
||||
// TODO: set large fields to null
|
||||
disposedValue = true;
|
||||
}
|
||||
}
|
||||
|
||||
// // TODO: override finalizer only if 'Dispose(bool disposing)' has code to free unmanaged resources
|
||||
// ~Central()
|
||||
// {
|
||||
// // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
|
||||
// Dispose(disposing: false);
|
||||
// }
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
// Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
|
||||
Dispose(disposing: true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -3,10 +3,10 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
mc:Ignorable="d"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
|
||||
x:Class="TINK.View.Account.AccountPage"
|
||||
BackgroundColor="{DynamicResource background-color}">
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
@ -94,4 +94,4 @@
|
|||
</Grid>
|
||||
</StackLayout>
|
||||
</ContentView>
|
||||
</ViewCell>
|
||||
</ViewCell>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Contact.ContactPage"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ using System;
|
|||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.Contact;
|
||||
using Xamarin.Essentials;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
|
|
|||
132
Meinkonrad/TINK/View/Help/HelpPage.xaml
Normal file
132
Meinkonrad/TINK/View/Help/HelpPage.xaml
Normal file
|
|
@ -0,0 +1,132 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage
|
||||
xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Help.HelpPage"
|
||||
Style="{StaticResource TabbedPageStyle}">
|
||||
|
||||
<TabbedPage.Resources>
|
||||
<x:String x:Key="IconSmartphone"></x:String>
|
||||
<x:String x:Key="IconTariff"></x:String>
|
||||
<x:String x:Key="IconFaq"></x:String>
|
||||
</TabbedPage.Resources>
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Image Style="{StaticResource Image-Navbar}"/>
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingHelp}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
<!--Pages can be added as references or in line-->
|
||||
<ContentPage
|
||||
x:Name="FaqPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="FAQ">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconFaq}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="FaqWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding FaqHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
x:Name="ManualPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabManual}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconSmartphone}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="ManualWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding ManualHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
x:Name="TariffPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabTariffs}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconTariff}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="TariffsWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding TariffsHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</TabbedPage>
|
||||
53
Meinkonrad/TINK/View/Help/HelpPage.xaml.cs
Normal file
53
Meinkonrad/TINK/View/Help/HelpPage.xaml.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
using System.Globalization;
|
||||
using Serilog;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.Help;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Help
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class HelpPage : TabbedPage
|
||||
{
|
||||
public HelpPageViewModel ViewModel { get; }
|
||||
|
||||
public HelpPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
/// Info about renting.
|
||||
TariffsWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
TariffsWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Mietinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
/// Info about types of bikes.
|
||||
ManualWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
ManualWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Radinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
ViewModel = new HelpPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.TariffsResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ManualResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
|
||||
this.BindingContext = ViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Called when page is shown. </summary>
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
ViewModel.OnAppearing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Text;
|
||||
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class InfoPage : ContentPage
|
||||
{
|
||||
public InfoPage ()
|
||||
{
|
||||
InitializeComponent ();
|
||||
|
||||
#if __IOS__
|
||||
var resourcePrefix = "TINK.iOS.";
|
||||
#endif
|
||||
#if __ANDROID__
|
||||
var resourcePrefix = "TINK.Droid.";
|
||||
#endif
|
||||
#if WINDOWS_PHONE
|
||||
var resourcePrefix = "TINK.WinPhone.";
|
||||
#endif
|
||||
|
||||
Debug.WriteLine("Using this resource prefix: " + resourcePrefix);
|
||||
// note that the prefix includes the trailing period '.' that is required
|
||||
var assembly = typeof(InfoPage).GetTypeInfo().Assembly;
|
||||
Stream stream = assembly.GetManifestResourceStream
|
||||
(resourcePrefix + "HtmlResouces.Info.html");
|
||||
var l_oHtmlViewSource = new HtmlWebViewSource
|
||||
{
|
||||
Html = (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
|
||||
};
|
||||
InfoWebView.Source = l_oHtmlViewSource;
|
||||
}
|
||||
}
|
||||
}
|
||||
20
Meinkonrad/TINK/View/LegalInformation/InfoPage.xaml.cs~HEAD
Normal file
20
Meinkonrad/TINK/View/LegalInformation/InfoPage.xaml.cs~HEAD
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Info
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class InfoPage : ContentPage
|
||||
{
|
||||
public InfoPage ()
|
||||
{
|
||||
InitializeComponent ();
|
||||
}
|
||||
}
|
||||
}
|
||||
164
Meinkonrad/TINK/View/LegalInformation/LegalInformationPage.xaml
Normal file
164
Meinkonrad/TINK/View/LegalInformation/LegalInformationPage.xaml
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.LegalInformation.LegalInformationPage"
|
||||
Style="{StaticResource TabbedPageStyle}">
|
||||
|
||||
<TabbedPage.Resources>
|
||||
<x:String x:Key="IconSmartphone"></x:String>
|
||||
<x:String x:Key="IconPersonSafety"></x:String>
|
||||
<x:String x:Key="IconDataSafety"></x:String>
|
||||
<x:String x:Key="IconLegalInfo"></x:String>
|
||||
</TabbedPage.Resources>
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Image Style="{StaticResource Image-Navbar}"/>
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingLegalInformation}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
<!--Pages can be added as references or in line-->
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabApp}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconSmartphone}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="InfoLicenses"
|
||||
Source="{Binding AppHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabPrivacy}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconPersonSafety}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="PrivacyWebView"
|
||||
Source="{Binding PrivacyHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabGtc}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconDataSafety}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="GtcWebView"
|
||||
Source ="{Binding GtcHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabImpress}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconLegalInfo}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="ImpressWebView"
|
||||
Source="{Binding ImpressHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</TabbedPage>
|
||||
|
|
@ -0,0 +1,60 @@
|
|||
using System.Globalization;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.LegalInformation
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class LegalInformationPage : TabbedPage
|
||||
{
|
||||
public LegalInformationPageViewModel ViewModel { get; }
|
||||
|
||||
public LegalInformationPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
ViewModel = new LegalInformationPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.GtcResourcePath,
|
||||
App.ModelRoot.ResourceUrls.PrivacyResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ImpressResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
resourceName => ViewModelResourceHelper.GetEmbeddedResource(resourceName),
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
this.BindingContext = ViewModel;
|
||||
|
||||
InfoLicenses.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoLicenses.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Lizenzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
PrivacyWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
PrivacyWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Datenschutzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
GtcWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
GtcWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann allgemeine Geschäftsbedingungen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
ImpressWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
ImpressWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Impressum nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
}
|
||||
|
||||
/// <summary> Called when page is shown. </summary>
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
ViewModel.OnAppearing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
|
||||
x:Class="TINK.View.Login.LoginPage"
|
||||
BackgroundColor="{DynamicResource background-color}">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Image Style="{StaticResource Image-Navbar}"/>
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingMapPage}"/>
|
||||
Text="{x:Static resources:AppResources.MarkingBikeLocations}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<FlyoutPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.Root.RootPage"
|
||||
xmlns:pages="clr-namespace:TINK.View.Root"
|
||||
xmlns:mappage="clr-namespace:TINK.View.Map">
|
||||
<FlyoutPage.Flyout>
|
||||
<pages:RootPageFlyout x:Name="FlyoutPage" />
|
||||
</FlyoutPage.Flyout>
|
||||
<FlyoutPage.Detail>
|
||||
<NavigationPage>
|
||||
<x:Arguments>
|
||||
<mappage:MapPage />
|
||||
</x:Arguments>
|
||||
</NavigationPage>
|
||||
</FlyoutPage.Detail>
|
||||
</FlyoutPage>
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.Root.RootPageFlyout"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:local="clr-namespace:TINK.View"
|
||||
IconImageSource="menu"
|
||||
Title="sharee.bike">
|
||||
<StackLayout>
|
||||
<ListView x:Name="MenuItemsListView"
|
||||
SeparatorVisibility="None"
|
||||
HasUnevenRows="true"
|
||||
local:ListViewAttachedBehavior.Command="{Binding MenuItemSelected}"
|
||||
ItemsSource="{Binding MenuItems}">
|
||||
<ListView.Header>
|
||||
<Grid BackgroundColor="{DynamicResource Key=primary-back-title-color}">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="10"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="10"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="30"/>
|
||||
<RowDefinition Height="80"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="10"/>
|
||||
</Grid.RowDefinitions>
|
||||
<Label
|
||||
Grid.Column="1"
|
||||
Grid.Row="2"
|
||||
Text="{Binding MasterDetailMenuTitlte}"
|
||||
Style="{DynamicResource SubtitleStyle}"/>
|
||||
</Grid>
|
||||
</ListView.Header>
|
||||
<ListView.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<ViewCell>
|
||||
<Grid Padding="5,10">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="30"/>
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Image>
|
||||
<Image.Source>
|
||||
<FontImageSource Glyph="{Binding GlyphCode}" Color="Black" FontFamily="FA-S"/>
|
||||
</Image.Source>
|
||||
</Image>
|
||||
<Label
|
||||
Grid.Column="1"
|
||||
Margin="10, 0, 0, 0"
|
||||
VerticalOptions="FillAndExpand"
|
||||
VerticalTextAlignment="Center"
|
||||
FontSize="18"
|
||||
Text="{Binding Title}"/>
|
||||
</Grid>
|
||||
</ViewCell>
|
||||
</DataTemplate>
|
||||
</ListView.ItemTemplate>
|
||||
</ListView>
|
||||
</StackLayout>
|
||||
</ContentPage>
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using System.Linq;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using TINK.Model;
|
||||
using TINK.Services;
|
||||
#if USEFLYOUT
|
||||
using TINK.View.MasterDetail;
|
||||
#endif
|
||||
using TINK.View.Themes;
|
||||
using TINK.ViewModel.Root;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Root
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class RootPageFlyout : ContentPage
|
||||
{
|
||||
public ListView ListView;
|
||||
|
||||
public RootPageFlyout()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
BindingContext = new RootPageFlyoutViewModel();
|
||||
|
||||
ListView = MenuItemsListView;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -3,13 +3,14 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:mappage="clr-namespace:TINK.View.Map"
|
||||
xmlns:findbike="clr-namespace:TINK.View.FindBike"
|
||||
xmlns:findbike="clr-namespace:TINK.View.SelectBike"
|
||||
xmlns:mybikes="clr-namespace:TINK.View.MyBikes"
|
||||
xmlns:account="clr-namespace:TINK.View.Account"
|
||||
xmlns:login="clr-namespace:TINK.View.Login"
|
||||
xmlns:settings="clr-namespace:TINK.View.Settings"
|
||||
xmlns:contact="clr-namespace:TINK.View.Contact"
|
||||
xmlns:info="clr-namespace:TINK.View.Info"
|
||||
xmlns:help="clr-namespace:TINK.View.Help"
|
||||
xmlns:info="clr-namespace:TINK.View.LegalInformation"
|
||||
xmlns:header="clr-namespace:TINK.View.RootShell"
|
||||
Title="Shell"
|
||||
x:Class="TINK.View.RootShell.AppShell">
|
||||
|
|
@ -20,7 +21,7 @@
|
|||
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingMapPage}"
|
||||
Title="{x:Static resources:AppResources.MarkingBikeLocations}"
|
||||
Route="MapPage"
|
||||
ContentTemplate="{DataTemplate mappage:MapPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -30,11 +31,11 @@
|
|||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFindBike}"
|
||||
IsVisible="{Binding IsFindBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:FindBikePage}">
|
||||
Title="{x:Static resources:AppResources.MarkingSelectBike}"
|
||||
IsVisible="{Binding IsSelectBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:SelectBikePage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFindBike}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
|
||||
<FontImageSource Glyph="{StaticResource IconSelectBike}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
|
|
@ -71,7 +72,7 @@
|
|||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}"
|
||||
Title="{x:Static resources:AppResources.MarkingContact}"
|
||||
Route="ContactPage"
|
||||
ContentTemplate="{DataTemplate contact:ContactPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -91,17 +92,17 @@
|
|||
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeesAndBikes}"
|
||||
ContentTemplate="{DataTemplate contact:FeesAndBikesPage}">
|
||||
Title="{x:Static resources:AppResources.MarkingHelp}"
|
||||
ContentTemplate="{DataTemplate help:HelpPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFeesAndBikes}" Color="DimGray" FontFamily="FA-S"/>
|
||||
<FontImageSource Glyph="{StaticResource IconHelp}" Color="DimGray" FontFamily="FA-S"/>
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{Binding TabbedPageIngoTitle}"
|
||||
ContentTemplate="{DataTemplate info:InfoPage}">
|
||||
Title="{x:Static resources:AppResources.MarkingLegalInformation}"
|
||||
ContentTemplate="{DataTemplate info:LegalInformationPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconLegalInfo}" Color="DimGray" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
|
|
|
|||
209
Meinkonrad/TINK/View/SelectBike/SelectBikePage.xaml
Normal file
209
Meinkonrad/TINK/View/SelectBike/SelectBikePage.xaml
Normal file
|
|
@ -0,0 +1,209 @@
|
|||
<?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:xct="http://xamarin.com/schemas/2020/toolkit"
|
||||
x:Class="TINK.View.SelectBike.SelectBikePage"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
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.NavBarIsVisible="{Binding IsIdle}">
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBike}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
<ContentPage.Resources>
|
||||
<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>
|
||||
|
||||
<ContentPage.Content>
|
||||
|
||||
<!--Grid for Bike(s) view and Running process in same row-->
|
||||
<Grid>
|
||||
|
||||
<!-- Grid for Content -->
|
||||
<Grid
|
||||
IsVisible="{Binding RentalProcess.State, Converter={StaticResource RentalProcessToVisibleConverter}}"
|
||||
Grid.Row="0"
|
||||
RowSpacing="0"
|
||||
RowDefinitions="1*,Auto">
|
||||
|
||||
<StackLayout
|
||||
Grid.Row="0"
|
||||
Spacing="0"
|
||||
Orientation="Vertical">
|
||||
|
||||
<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.MarkingSelectBikeTypeOfBikeText}"/>
|
||||
<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>
|
||||
|
||||
<Grid
|
||||
RowDefinitions="Auto,Auto"
|
||||
ColumnDefinitions="*,Auto">
|
||||
|
||||
<!--Search bike-->
|
||||
<Label
|
||||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2"
|
||||
Grid.Row="0"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBikeLabel}"
|
||||
Margin="0,5,0,-5">
|
||||
</Label>
|
||||
<Entry
|
||||
Grid.Column="0"
|
||||
Grid.Row="1"
|
||||
x:Name="SelectBikeEntry"
|
||||
Placeholder="{x:Static resources:AppResources.PlaceholderSelectBike}"
|
||||
MaxLength="10"
|
||||
CursorPosition="0"
|
||||
Text="{Binding BikeIdUserInput, Mode=TwoWay}"/>
|
||||
|
||||
<Button
|
||||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
WidthRequest="100"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBikeButton}"
|
||||
Command="{Binding OnSelectBikeRequest}">
|
||||
<Button.Triggers>
|
||||
<DataTrigger TargetType="Button" Binding="{Binding IsSelectBikeEnabled}" Value="False">
|
||||
<Setter Property="BorderColor" Value="DimGray" />
|
||||
<Setter Property="BackgroundColor" Value="DimGray" />
|
||||
<Setter Property="TextColor" Value="LightGray" />
|
||||
</DataTrigger>
|
||||
</Button.Triggers>
|
||||
</Button>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!--Line-->
|
||||
<BoxView
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{DynamicResource primary-back-title-color}"/>
|
||||
|
||||
</StackLayout>
|
||||
|
||||
<!--No Network Connection-->
|
||||
<sharedGui:NotConnectedToNetView/>
|
||||
|
||||
<!--Bike data-->
|
||||
<Grid
|
||||
RowDefinitions="Auto,Auto"
|
||||
RowSpacing="0">
|
||||
|
||||
<!--Hint for Outdated Data.-->
|
||||
<sharedGui:HintForRefreshingPageView
|
||||
Grid.Row="0"/>
|
||||
|
||||
<!--Bike-->
|
||||
<ListView
|
||||
Grid.Row="1"
|
||||
x:Name="SelectBikeListView"
|
||||
BackgroundColor="{DynamicResource background-color}"
|
||||
SelectionMode="None"
|
||||
SelectedItem="{Binding SelectedBike}"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
HasUnevenRows="True"
|
||||
SeparatorVisibility="None"
|
||||
ItemTemplate="{StaticResource bikeTemplateSelector}"
|
||||
IsPullToRefreshEnabled="True"
|
||||
RefreshCommand="{Binding RefreshCommand}"
|
||||
IsRefreshing="{Binding IsRefreshing}"/>
|
||||
</Grid>
|
||||
|
||||
</StackLayout>
|
||||
|
||||
<!--Info text-->
|
||||
<Label
|
||||
Grid.Row="1"
|
||||
Text="{Binding StatusInfoText}"
|
||||
IsVisible="{Binding Path=IsProcessWithRunningProcessView, Converter={StaticResource InvertedBoolConverter}}"
|
||||
FontSize="Small"
|
||||
Padding="5"
|
||||
TextColor="DimGray"
|
||||
HorizontalOptions="CenterAndExpand">
|
||||
<Label.Triggers>
|
||||
<DataTrigger
|
||||
TargetType="Label"
|
||||
Binding="{Binding Path=StatusInfoText.Length}" Value="0">
|
||||
<Setter Property="HeightRequest" Value="0" />
|
||||
</DataTrigger>
|
||||
<DataTrigger
|
||||
TargetType="Label"
|
||||
Binding="{Binding Path=StatusInfoText}" Value="Offline.">
|
||||
<Setter Property="HeightRequest" Value="0" />
|
||||
</DataTrigger>
|
||||
</Label.Triggers>
|
||||
</Label>
|
||||
|
||||
</Grid>
|
||||
|
||||
<!--While process is running-->
|
||||
<sharedGui:RunningProcessView
|
||||
Grid.Row="0"
|
||||
IsVisible="{Binding IsProcessWithRunningProcessView}"/>
|
||||
|
||||
<!--CloseLock View-->
|
||||
<bikeRentalProcess:RentalProcessBookedOpenCloseLock
|
||||
Grid.Row="0"/>
|
||||
|
||||
<!--EndRental View-->
|
||||
<bikeRentalProcess:RentalProcessBookedClosedEndRental
|
||||
Grid.Row="0"/>
|
||||
|
||||
</Grid>
|
||||
|
||||
</ContentPage.Content>
|
||||
|
||||
</ContentPage>
|
||||
179
Meinkonrad/TINK/View/SelectBike/SelectBikePage.xaml.cs
Normal file
179
Meinkonrad/TINK/View/SelectBike/SelectBikePage.xaml.cs
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
using System;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using Serilog;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
using TINK.MultilingualResources;
|
||||
using TINK.ViewModel.SelectBike;
|
||||
using Xamarin.CommunityToolkit.Extensions;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.SelectBike
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class SelectBikePage : ContentPage, IViewService
|
||||
{
|
||||
/// <summary> Reference to view model. </summary>
|
||||
SelectBikePageViewModel m_oViewModel = null;
|
||||
|
||||
/// <summary>
|
||||
/// Holds a value indicating whether page already subscribed to shell item changes or not.
|
||||
/// </summary>
|
||||
private bool _IsShellItemChangedReceived = false;
|
||||
|
||||
public SelectBikePage() { }
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when page is shown.
|
||||
/// Starts update process.
|
||||
/// </summary>
|
||||
protected async override void OnAppearing()
|
||||
{
|
||||
if (m_oViewModel != null)
|
||||
{
|
||||
// No need to create view model, set binding context an items source if already done.
|
||||
// If done twice tap events are fired multiple times (when hiding page using home button).
|
||||
await m_oViewModel.OnAppearingOrRefresh();
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var model = App.ModelRoot;
|
||||
|
||||
m_oViewModel = new SelectBikePageViewModel(
|
||||
model.ActiveUser,
|
||||
model,
|
||||
App.PermissionsService,
|
||||
App.BluetoothService,
|
||||
Device.RuntimePlatform,
|
||||
() => model.GetIsConnected(),
|
||||
(isConnected) => model.GetConnector(isConnected),
|
||||
App.LocationServicesContainer.Active,
|
||||
model.LocksServices.Active,
|
||||
model.Stations,
|
||||
model.Polling,
|
||||
model.PostAction,
|
||||
model.SmartDevice,
|
||||
this,
|
||||
(url) => DependencyService.Get<IExternalBrowserService>().OpenUrl(url))
|
||||
{
|
||||
IsReportLevelVerbose = model.IsReportLevelVerbose
|
||||
};
|
||||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Log.ForContext<SelectBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
|
||||
await DisplayAlert(
|
||||
AppResources.ErrorPageNotLoadedTitle,
|
||||
$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
|
||||
AppResources.MessageAnswerOk);
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
InitializeComponent();
|
||||
|
||||
BindingContext = m_oViewModel;
|
||||
SelectBikeListView.ItemsSource = m_oViewModel;
|
||||
|
||||
await m_oViewModel.OnAppearingOrRefresh();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when page is disappearing to
|
||||
/// - stop the update process
|
||||
/// - to subscribe to events.
|
||||
/// </summary>
|
||||
protected async override void OnDisappearing()
|
||||
{
|
||||
if (!_IsShellItemChangedReceived && Shell.Current != null)
|
||||
{
|
||||
// Subscribe to events.
|
||||
// Do not do this on startup because Shell.Current is null, if FindeBikePage is startup page.
|
||||
Shell.Current.Navigated += (sender, e) =>
|
||||
{
|
||||
if (e.Source != ShellNavigationSource.ShellItemChanged)
|
||||
{
|
||||
// Nothing to do.
|
||||
return;
|
||||
}
|
||||
|
||||
// Reset previous user input after switch of pages to allow user to select a differnt bike if one has been selected before.
|
||||
m_oViewModel.BikeIdUserInput = String.Empty;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
_IsShellItemChangedReceived = true;
|
||||
|
||||
await (m_oViewModel?.OnDisappearing() ?? Task.CompletedTask);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Displays alert message.
|
||||
/// </summary>
|
||||
/// <param name="p_strTitle">Title of message.</param>
|
||||
/// <param name="p_strMessage">Message to display.</param>
|
||||
/// <param name="p_strCancel">Type of buttons.</param>
|
||||
public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strCancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strCancel);
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="cancel">Type of buttons.</param>
|
||||
public async Task DisplayAdvancedAlert(
|
||||
string title,
|
||||
string message,
|
||||
string details,
|
||||
string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
|
||||
|
||||
/// <summary> Displays detailed alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="accept">Text of accept button.</param>
|
||||
/// <param name="cancel">Text of cancel button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
|
||||
|
||||
/// <summary>
|
||||
/// Displays alert message.
|
||||
/// </summary>
|
||||
/// <param name="p_strTitle">Title of message.</param>
|
||||
/// <param name="p_strMessage">Message to display.</param>
|
||||
/// <param name="p_strAccept">Text of accept button.</param>
|
||||
/// <param name="p_strCancel">Text of button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public new async Task<bool> DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(p_strTitle, p_strMessage, p_strAccept, p_strCancel);
|
||||
|
||||
/// <summary> Shows a page.</summary>
|
||||
/// <param name="route">Route of the page to show.</param>
|
||||
public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
|
||||
|
||||
/// <summary> Pushes a page onto the modal stack. </summary>
|
||||
/// <param name="typeOfPage">Page to display.</param>
|
||||
public async Task PushModalAsync(ViewTypes typeOfPage)
|
||||
=> await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType()));
|
||||
|
||||
/// <summary> Pops a page from the modal stack. </summary>
|
||||
public Task PopModalAsync() => throw new NotSupportedException();
|
||||
|
||||
/// <summary> Pushes a page onto the stack. </summary>
|
||||
/// <param name="p_oTypeOfPage">Page to display.</param>
|
||||
public Task PushAsync(ViewTypes p_oTypeOfPage) => throw new NotSupportedException();
|
||||
|
||||
#if USCSHARP9
|
||||
public async Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup());
|
||||
#else
|
||||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBatteryMutable battery = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery));
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -2,14 +2,16 @@ using System;
|
|||
using TINK.View.BikesAtStation;
|
||||
using TINK.View.Contact;
|
||||
using TINK.View.CopriWebView;
|
||||
using TINK.View.Info;
|
||||
using TINK.View.SelectBike;
|
||||
using TINK.View.LegalInformation;
|
||||
using TINK.View.Help;
|
||||
using TINK.View.Login;
|
||||
using TINK.View.Map;
|
||||
using TINK.View.MiniSurvey;
|
||||
using TINK.View.MyBikes;
|
||||
using TINK.View.Settings;
|
||||
using TINK.View.WhatsNew;
|
||||
using TINK.View.WhatsNew.Agb;
|
||||
using TINK.View.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace TINK.View
|
||||
|
|
@ -38,17 +40,17 @@ namespace TINK.View
|
|||
case ViewTypes.SettingsPage:
|
||||
return typeof(SettingsPage);
|
||||
|
||||
case ViewTypes.TabbedPageInfo:
|
||||
return typeof(InfoPage);
|
||||
case ViewTypes.LegalInformationPage:
|
||||
return typeof(LegalInformationPage);
|
||||
|
||||
case ViewTypes.FeesAndBikesPage:
|
||||
return typeof(FeesAndBikesPage);
|
||||
case ViewTypes.HelpPage:
|
||||
return typeof(HelpPage);
|
||||
|
||||
case ViewTypes.ManageAccountPage:
|
||||
return typeof(ManageAccountPage);
|
||||
|
||||
case ViewTypes.AgbPage:
|
||||
return typeof(AgbPage);
|
||||
case ViewTypes.GtcPage:
|
||||
return typeof(GtcPage);
|
||||
|
||||
case ViewTypes.WhatsNewPage:
|
||||
return typeof(WhatsNewPage);
|
||||
|
|
@ -65,6 +67,9 @@ namespace TINK.View
|
|||
case ViewTypes.MiniSurvey:
|
||||
return typeof(MiniSurveyPage);
|
||||
|
||||
case ViewTypes.SelectBikePage:
|
||||
return typeof(SelectBikePage);
|
||||
|
||||
default:
|
||||
return typeof(ContentPage);
|
||||
}
|
||||
|
|
|
|||
21
Meinkonrad/TINK/View/WhatsNew/Gtc/GtcPage.xaml
Normal file
21
Meinkonrad/TINK/View/WhatsNew/Gtc/GtcPage.xaml
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.WhatsNew.Gtc.GtcPage">
|
||||
<ContentPage.Content>
|
||||
<Frame>
|
||||
<StackLayout>
|
||||
<WebView
|
||||
HeightRequest="1000"
|
||||
WidthRequest="500"
|
||||
Source="{Binding GtcHtml}"/>
|
||||
<Button
|
||||
Text="OK"
|
||||
WidthRequest="100"
|
||||
Command="{Binding OnOk}"
|
||||
Margin="0,0,0,3"/>
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
77
Meinkonrad/TINK/View/WhatsNew/Gtc/GtcPage.xaml.cs
Normal file
77
Meinkonrad/TINK/View/WhatsNew/Gtc/GtcPage.xaml.cs
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.WhatsNew.Gtc
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class GtcPage : ContentPage, IViewService
|
||||
{
|
||||
public GtcPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
gtcViewModel = new GtcViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
(resourceName) => ViewModelResourceHelper.GetEmbeddedResource(resourceName),
|
||||
this);
|
||||
|
||||
BindingContext = gtcViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="cancel">Type of buttons.</param>
|
||||
public async Task DisplayAdvancedAlert(
|
||||
string title,
|
||||
string message,
|
||||
string details,
|
||||
string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
|
||||
|
||||
/// <summary> Displays detailed alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="accept">Text of accept button.</param>
|
||||
/// <param name="cancel">Text of cancel button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
|
||||
|
||||
/// <summary> Invoked when page is shown. </summary>
|
||||
protected async override void OnAppearing()
|
||||
=> await gtcViewModel.OnAppearing();
|
||||
|
||||
/// <summary> Reference to view model.</summary>
|
||||
GtcViewModel gtcViewModel;
|
||||
|
||||
public async Task PopModalAsync()
|
||||
=> await Navigation.PopModalAsync();
|
||||
|
||||
/// <summary> Pushes a page onto the stack. </summary>
|
||||
/// <param name="p_oTypeOfPage">Page to display.</param>
|
||||
public Task PushAsync(ViewTypes p_oTypeOfPage)
|
||||
=> throw new NotImplementedException();
|
||||
|
||||
public Task PushModalAsync(ViewTypes p_oTypeOfPage)
|
||||
=> throw new NotImplementedException();
|
||||
|
||||
/// <summary> Shows a page.</summary>
|
||||
/// <param name="route">Route of the page to show.</param>
|
||||
public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
|
||||
|
||||
#if USCSHARP9
|
||||
public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
|
||||
#else
|
||||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ using TINK.MultilingualResources;
|
|||
using TINK.Services;
|
||||
using TINK.Services.CopriApi.ServerUris;
|
||||
using TINK.View.Themes;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
|
||||
namespace TINK.ViewModel.RootShell
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@ namespace TINK.ViewModel.RootShell
|
|||
{
|
||||
// Login state changed. Update related menu entries.
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSelectBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
|
||||
};
|
||||
|
|
@ -56,13 +56,11 @@ namespace TINK.ViewModel.RootShell
|
|||
|
||||
public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
public bool IsSelectBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public string TabbedPageIngoTitle => AppResources.MarkingAbout;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessBikeInfo">
|
||||
|
||||
<ContentView.Resources>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="ShareeSharedGuiLib.View.Bike.RentalProcess.RentalProcessStepBarFinished">
|
||||
|
|
|
|||
|
|
@ -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.375" android:versionCode="375">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.376" android:versionCode="376">
|
||||
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="33" />
|
||||
<!-- Google Maps related permissions -->
|
||||
<!-- Permission to receive remote notifications from Google Play Services -->
|
||||
|
|
|
|||
145
TINK/TINK.Android/Resources/Resource.Designer.cs
generated
145
TINK/TINK.Android/Resources/Resource.Designer.cs
generated
|
|
@ -14,7 +14,7 @@ namespace TINK.Droid
|
|||
{
|
||||
|
||||
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
|
||||
public partial class Resource
|
||||
{
|
||||
|
||||
|
|
@ -24061,214 +24061,217 @@ namespace TINK.Droid
|
|||
public const int ic_vol_unmute = 2131165513;
|
||||
|
||||
// aapt resource value: 0x7F07014A
|
||||
public const int material_cursor_drawable = 2131165514;
|
||||
public const int Location_Button = 2131165514;
|
||||
|
||||
// aapt resource value: 0x7F07014B
|
||||
public const int material_ic_calendar_black_24dp = 2131165515;
|
||||
public const int material_cursor_drawable = 2131165515;
|
||||
|
||||
// aapt resource value: 0x7F07014C
|
||||
public const int material_ic_clear_black_24dp = 2131165516;
|
||||
public const int material_ic_calendar_black_24dp = 2131165516;
|
||||
|
||||
// aapt resource value: 0x7F07014D
|
||||
public const int material_ic_edit_black_24dp = 2131165517;
|
||||
public const int material_ic_clear_black_24dp = 2131165517;
|
||||
|
||||
// aapt resource value: 0x7F07014E
|
||||
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165518;
|
||||
public const int material_ic_edit_black_24dp = 2131165518;
|
||||
|
||||
// aapt resource value: 0x7F07014F
|
||||
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165519;
|
||||
public const int material_ic_keyboard_arrow_left_black_24dp = 2131165519;
|
||||
|
||||
// aapt resource value: 0x7F070150
|
||||
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165520;
|
||||
public const int material_ic_keyboard_arrow_next_black_24dp = 2131165520;
|
||||
|
||||
// aapt resource value: 0x7F070151
|
||||
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165521;
|
||||
public const int material_ic_keyboard_arrow_previous_black_24dp = 2131165521;
|
||||
|
||||
// aapt resource value: 0x7F070152
|
||||
public const int material_ic_menu_arrow_down_black_24dp = 2131165522;
|
||||
public const int material_ic_keyboard_arrow_right_black_24dp = 2131165522;
|
||||
|
||||
// aapt resource value: 0x7F070153
|
||||
public const int material_ic_menu_arrow_up_black_24dp = 2131165523;
|
||||
public const int material_ic_menu_arrow_down_black_24dp = 2131165523;
|
||||
|
||||
// aapt resource value: 0x7F070154
|
||||
public const int menu_logo = 2131165524;
|
||||
public const int material_ic_menu_arrow_up_black_24dp = 2131165524;
|
||||
|
||||
// aapt resource value: 0x7F070155
|
||||
public const int mr_button_connected_dark = 2131165525;
|
||||
public const int menu_logo = 2131165525;
|
||||
|
||||
// aapt resource value: 0x7F070156
|
||||
public const int mr_button_connected_light = 2131165526;
|
||||
public const int mr_button_connected_dark = 2131165526;
|
||||
|
||||
// aapt resource value: 0x7F070157
|
||||
public const int mr_button_connecting_dark = 2131165527;
|
||||
public const int mr_button_connected_light = 2131165527;
|
||||
|
||||
// aapt resource value: 0x7F070158
|
||||
public const int mr_button_connecting_light = 2131165528;
|
||||
public const int mr_button_connecting_dark = 2131165528;
|
||||
|
||||
// aapt resource value: 0x7F070159
|
||||
public const int mr_button_dark = 2131165529;
|
||||
public const int mr_button_connecting_light = 2131165529;
|
||||
|
||||
// aapt resource value: 0x7F07015A
|
||||
public const int mr_button_dark_static = 2131165530;
|
||||
public const int mr_button_dark = 2131165530;
|
||||
|
||||
// aapt resource value: 0x7F07015B
|
||||
public const int mr_button_light = 2131165531;
|
||||
public const int mr_button_dark_static = 2131165531;
|
||||
|
||||
// aapt resource value: 0x7F07015C
|
||||
public const int mr_button_light_static = 2131165532;
|
||||
public const int mr_button_light = 2131165532;
|
||||
|
||||
// aapt resource value: 0x7F07015D
|
||||
public const int mr_cast_checkbox = 2131165533;
|
||||
public const int mr_button_light_static = 2131165533;
|
||||
|
||||
// aapt resource value: 0x7F07015E
|
||||
public const int mr_cast_group_seekbar_track = 2131165534;
|
||||
public const int mr_cast_checkbox = 2131165534;
|
||||
|
||||
// aapt resource value: 0x7F07015F
|
||||
public const int mr_cast_mute_button = 2131165535;
|
||||
public const int mr_cast_group_seekbar_track = 2131165535;
|
||||
|
||||
// aapt resource value: 0x7F070160
|
||||
public const int mr_cast_route_seekbar_track = 2131165536;
|
||||
public const int mr_cast_mute_button = 2131165536;
|
||||
|
||||
// aapt resource value: 0x7F070161
|
||||
public const int mr_cast_stop = 2131165537;
|
||||
public const int mr_cast_route_seekbar_track = 2131165537;
|
||||
|
||||
// aapt resource value: 0x7F070162
|
||||
public const int mr_cast_thumb = 2131165538;
|
||||
public const int mr_cast_stop = 2131165538;
|
||||
|
||||
// aapt resource value: 0x7F070163
|
||||
public const int mr_dialog_close_dark = 2131165539;
|
||||
public const int mr_cast_thumb = 2131165539;
|
||||
|
||||
// aapt resource value: 0x7F070164
|
||||
public const int mr_dialog_close_light = 2131165540;
|
||||
public const int mr_dialog_close_dark = 2131165540;
|
||||
|
||||
// aapt resource value: 0x7F070165
|
||||
public const int mr_dialog_material_background_dark = 2131165541;
|
||||
public const int mr_dialog_close_light = 2131165541;
|
||||
|
||||
// aapt resource value: 0x7F070166
|
||||
public const int mr_dialog_material_background_light = 2131165542;
|
||||
public const int mr_dialog_material_background_dark = 2131165542;
|
||||
|
||||
// aapt resource value: 0x7F070167
|
||||
public const int mr_group_collapse = 2131165543;
|
||||
public const int mr_dialog_material_background_light = 2131165543;
|
||||
|
||||
// aapt resource value: 0x7F070168
|
||||
public const int mr_group_expand = 2131165544;
|
||||
public const int mr_group_collapse = 2131165544;
|
||||
|
||||
// aapt resource value: 0x7F070169
|
||||
public const int mr_media_pause_dark = 2131165545;
|
||||
public const int mr_group_expand = 2131165545;
|
||||
|
||||
// aapt resource value: 0x7F07016A
|
||||
public const int mr_media_pause_light = 2131165546;
|
||||
public const int mr_media_pause_dark = 2131165546;
|
||||
|
||||
// aapt resource value: 0x7F07016B
|
||||
public const int mr_media_play_dark = 2131165547;
|
||||
public const int mr_media_pause_light = 2131165547;
|
||||
|
||||
// aapt resource value: 0x7F07016C
|
||||
public const int mr_media_play_light = 2131165548;
|
||||
public const int mr_media_play_dark = 2131165548;
|
||||
|
||||
// aapt resource value: 0x7F07016D
|
||||
public const int mr_media_stop_dark = 2131165549;
|
||||
public const int mr_media_play_light = 2131165549;
|
||||
|
||||
// aapt resource value: 0x7F07016E
|
||||
public const int mr_media_stop_light = 2131165550;
|
||||
public const int mr_media_stop_dark = 2131165550;
|
||||
|
||||
// aapt resource value: 0x7F07016F
|
||||
public const int mr_vol_type_audiotrack_dark = 2131165551;
|
||||
public const int mr_media_stop_light = 2131165551;
|
||||
|
||||
// aapt resource value: 0x7F070170
|
||||
public const int mr_vol_type_audiotrack_light = 2131165552;
|
||||
public const int mr_vol_type_audiotrack_dark = 2131165552;
|
||||
|
||||
// aapt resource value: 0x7F070171
|
||||
public const int mr_wifi_icon_dark = 2131165553;
|
||||
public const int mr_vol_type_audiotrack_light = 2131165553;
|
||||
|
||||
// aapt resource value: 0x7F070172
|
||||
public const int mr_wifi_icon_light = 2131165554;
|
||||
public const int mr_wifi_icon_dark = 2131165554;
|
||||
|
||||
// aapt resource value: 0x7F070173
|
||||
public const int mtrl_dialog_background = 2131165555;
|
||||
public const int mr_wifi_icon_light = 2131165555;
|
||||
|
||||
// aapt resource value: 0x7F070174
|
||||
public const int mtrl_dropdown_arrow = 2131165556;
|
||||
public const int mtrl_dialog_background = 2131165556;
|
||||
|
||||
// aapt resource value: 0x7F070175
|
||||
public const int mtrl_ic_arrow_drop_down = 2131165557;
|
||||
public const int mtrl_dropdown_arrow = 2131165557;
|
||||
|
||||
// aapt resource value: 0x7F070176
|
||||
public const int mtrl_ic_arrow_drop_up = 2131165558;
|
||||
public const int mtrl_ic_arrow_drop_down = 2131165558;
|
||||
|
||||
// aapt resource value: 0x7F070177
|
||||
public const int mtrl_ic_cancel = 2131165559;
|
||||
public const int mtrl_ic_arrow_drop_up = 2131165559;
|
||||
|
||||
// aapt resource value: 0x7F070178
|
||||
public const int mtrl_ic_error = 2131165560;
|
||||
public const int mtrl_ic_cancel = 2131165560;
|
||||
|
||||
// aapt resource value: 0x7F070179
|
||||
public const int mtrl_navigation_bar_item_background = 2131165561;
|
||||
public const int mtrl_ic_error = 2131165561;
|
||||
|
||||
// aapt resource value: 0x7F07017A
|
||||
public const int mtrl_popupmenu_background = 2131165562;
|
||||
public const int mtrl_navigation_bar_item_background = 2131165562;
|
||||
|
||||
// aapt resource value: 0x7F07017B
|
||||
public const int mtrl_popupmenu_background_dark = 2131165563;
|
||||
public const int mtrl_popupmenu_background = 2131165563;
|
||||
|
||||
// aapt resource value: 0x7F07017C
|
||||
public const int mtrl_tabs_default_indicator = 2131165564;
|
||||
public const int mtrl_popupmenu_background_dark = 2131165564;
|
||||
|
||||
// aapt resource value: 0x7F07017D
|
||||
public const int navigation_empty_icon = 2131165565;
|
||||
public const int mtrl_tabs_default_indicator = 2131165565;
|
||||
|
||||
// aapt resource value: 0x7F07017E
|
||||
public const int notification_action_background = 2131165566;
|
||||
public const int navigation_empty_icon = 2131165566;
|
||||
|
||||
// aapt resource value: 0x7F07017F
|
||||
public const int notification_bg = 2131165567;
|
||||
public const int notification_action_background = 2131165567;
|
||||
|
||||
// aapt resource value: 0x7F070180
|
||||
public const int notification_bg_low = 2131165568;
|
||||
public const int notification_bg = 2131165568;
|
||||
|
||||
// aapt resource value: 0x7F070181
|
||||
public const int notification_bg_low_normal = 2131165569;
|
||||
public const int notification_bg_low = 2131165569;
|
||||
|
||||
// aapt resource value: 0x7F070182
|
||||
public const int notification_bg_low_pressed = 2131165570;
|
||||
public const int notification_bg_low_normal = 2131165570;
|
||||
|
||||
// aapt resource value: 0x7F070183
|
||||
public const int notification_bg_normal = 2131165571;
|
||||
public const int notification_bg_low_pressed = 2131165571;
|
||||
|
||||
// aapt resource value: 0x7F070184
|
||||
public const int notification_bg_normal_pressed = 2131165572;
|
||||
public const int notification_bg_normal = 2131165572;
|
||||
|
||||
// aapt resource value: 0x7F070185
|
||||
public const int notification_icon_background = 2131165573;
|
||||
public const int notification_bg_normal_pressed = 2131165573;
|
||||
|
||||
// aapt resource value: 0x7F070186
|
||||
public const int notification_oversize_large_icon_bg = 2131165574;
|
||||
public const int notification_icon_background = 2131165574;
|
||||
|
||||
// aapt resource value: 0x7F070187
|
||||
public const int notification_template_icon_bg = 2131165575;
|
||||
public const int notification_oversize_large_icon_bg = 2131165575;
|
||||
|
||||
// aapt resource value: 0x7F070188
|
||||
public const int notification_template_icon_low_bg = 2131165576;
|
||||
public const int notification_template_icon_bg = 2131165576;
|
||||
|
||||
// aapt resource value: 0x7F070189
|
||||
public const int notification_tile_bg = 2131165577;
|
||||
public const int notification_template_icon_low_bg = 2131165577;
|
||||
|
||||
// aapt resource value: 0x7F07018A
|
||||
public const int notify_panel_notification_icon_bg = 2131165578;
|
||||
public const int notification_tile_bg = 2131165578;
|
||||
|
||||
// aapt resource value: 0x7F07018B
|
||||
public const int preference_list_divider_material = 2131165579;
|
||||
public const int notify_panel_notification_icon_bg = 2131165579;
|
||||
|
||||
// aapt resource value: 0x7F07018C
|
||||
public const int test_custom_background = 2131165580;
|
||||
public const int preference_list_divider_material = 2131165580;
|
||||
|
||||
// aapt resource value: 0x7F07018D
|
||||
public const int test_level_drawable = 2131165581;
|
||||
public const int test_custom_background = 2131165581;
|
||||
|
||||
// aapt resource value: 0x7F07018E
|
||||
public const int tooltip_frame_dark = 2131165582;
|
||||
public const int test_level_drawable = 2131165582;
|
||||
|
||||
// aapt resource value: 0x7F07018F
|
||||
public const int tooltip_frame_light = 2131165583;
|
||||
public const int tooltip_frame_dark = 2131165583;
|
||||
|
||||
// aapt resource value: 0x7F070190
|
||||
public const int tooltip_frame_light = 2131165584;
|
||||
|
||||
static Drawable()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@
|
|||
<key>CFBundleDisplayName</key>
|
||||
<string>sharee.bike</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>375</string>
|
||||
<string>376</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>3.0.375</string>
|
||||
<string>3.0.376</string>
|
||||
<key>ITSAppUsesNonExemptEncryption</key>
|
||||
<false/>
|
||||
</dict>
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
<ResourceDictionary>
|
||||
<xct:InvertedBoolConverter x:Key="InvertedBoolConverter" />
|
||||
<x:String x:Key="IconMap"></x:String>
|
||||
<x:String x:Key="IconFindBike"></x:String>
|
||||
<x:String x:Key="IconSelectBike"></x:String>
|
||||
<x:String x:Key="IconMyBikes"></x:String>
|
||||
<x:String x:Key="IconAccount"></x:String>
|
||||
<x:String x:Key="IconLogin"></x:String>
|
||||
<x:String x:Key="IconSettings"></x:String>
|
||||
<x:String x:Key="IconFeesAndBikes"></x:String>
|
||||
<x:String x:Key="IconHelp"></x:String>
|
||||
<x:String x:Key="IconContact"></x:String>
|
||||
<x:String x:Key="IconInfo"></x:String>
|
||||
<x:String x:Key="IconClose"></x:String>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<!DOCTYPE html
|
||||
<!DOCTYPE html
|
||||
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" lang="de" xml:lang="de">
|
||||
|
|
@ -16,17 +16,21 @@
|
|||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
</head>
|
||||
<body>
|
||||
<div class='container'>
|
||||
<div id='Contenttxt'>
|
||||
<div class="content_title2">Version</div>
|
||||
<div style=""></div>
|
||||
<br />Version ACTIVE_APPNAME: <b>CURRENT_VERSION_TINKAPP</b>.
|
||||
<div class="content_title2">Entwickler</div>
|
||||
<div style=""></div>
|
||||
<br />Programmierung ACTIVE_APPNAME: O. Hauff, APPSUPPORTMAILADDRESS<br />
|
||||
<div class="content_title2">Verwendete Bibliotheken</div>
|
||||
<div style=""></div>
|
||||
<br /><table>
|
||||
<div class='container' id='Contenttxt'>
|
||||
<div class="content_title1" style="">
|
||||
<b>ACTIVE_APPNAME</b>
|
||||
</div>
|
||||
<div class="content_title2" style="">
|
||||
Version: CURRENT_VERSION_TINKAPP
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Entwicklung: O. Hauff und A. Müller-Meißner, APPSUPPORTMAILADDRESS
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Verwendete Bibliotheken:<br />
|
||||
<table>
|
||||
<tr><th>Paket </th><th>Lizenz </th></tr>
|
||||
<tr><td>Newtonsoft Json.NET von James Newton-King </td><td><a href="#MITLicense2007">MIT Lizenz 2007</a> </td></tr>
|
||||
<tr><td>PCLCrypto von AArnott </td><td><a href="#MSPL_Long">Microsoft Public License(Ms-PL)</a> </td></tr>
|
||||
|
|
@ -46,9 +50,10 @@
|
|||
<tr><td>Xamarin.Forms.GoogleMaps von amay077 </td><td><a href="#MITLicense2016_2017">MIT Lizenz 2016- 2017</a> </td></tr>
|
||||
<tr><td>Xamarin.Essentials von Microsoft </td><td><a href="#MITLicenseMicrosoft">MIT Lizenz</a> </td></tr>
|
||||
</table>
|
||||
|
||||
<div class="content_title2">Lizenzen</div>
|
||||
<div style=""></div>
|
||||
</div>
|
||||
<br />
|
||||
<div class="content_title2" style="">
|
||||
Lizenzen:
|
||||
<article id="ApacheLicense2.0_2004">
|
||||
<div class="content2">
|
||||
<span class='content1'>Apache License</span><br />
|
||||
|
|
@ -665,4 +670,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@
|
|||
<DependentUpon>ILockItBike.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\BoolInverterConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Contact\SelectStationPage.xaml.cs">
|
||||
<DependentUpon>SelectStationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -36,11 +35,10 @@
|
|||
<DependentUpon>FeedbackPopup.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml.cs">
|
||||
<DependentUpon>FindBikePage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml.cs">
|
||||
<DependentUpon>SelectBikePage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ListViewAttachedBehavior.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\MiniSurvey\MiniSurveyPage.xaml.cs">
|
||||
<DependentUpon>MiniSurveyPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
@ -61,11 +59,9 @@
|
|||
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
|
||||
<DependentUpon>AppShell.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\StringNotNullOrEmptyToVisibleConverter.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ViewTypesTypeProvider.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)Model\Device\SpecialFolder.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml.cs">
|
||||
<DependentUpon>FeesAndBikesPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml.cs">
|
||||
<DependentUpon>HelpPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\CopriWebView\ManageAccountPage.xaml.cs">
|
||||
|
|
@ -80,8 +76,9 @@
|
|||
<DependentUpon>PasswordForgottenPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml.cs">
|
||||
<DependentUpon>AgbPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\ViewTypesTypeProvider.cs" />
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml.cs">
|
||||
<DependentUpon>GtcPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\WhatsNew\WhatsNewPage.xaml.cs">
|
||||
|
|
@ -97,8 +94,8 @@
|
|||
<DependentUpon>ContactPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml.cs">
|
||||
<DependentUpon>InfoTabbedPage.xaml</DependentUpon>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml.cs">
|
||||
<DependentUpon>LegalInformationPage.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="$(MSBuildThisFileDirectory)View\Login\LoginPage.xaml.cs">
|
||||
|
|
@ -161,7 +158,7 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\BikesAtStation\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Help\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Login\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\Map\" />
|
||||
<Folder Include="$(MSBuildThisFileDirectory)View\MyBikes\" />
|
||||
|
|
@ -174,13 +171,13 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Info\InfoTabbedPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\LegalInformation\LegalInformationPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FeesAndBikes\FeesAndBikesPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Help\HelpPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -192,7 +189,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Agb\AgbPage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\WhatsNew\Gtc\GtcPage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
@ -246,7 +243,7 @@
|
|||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\FindBike\FindBikePage.xaml">
|
||||
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\SelectBike\SelectBikePage.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
|
||||
</EmbeddedResource>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
mc:Ignorable="d"
|
||||
x:Class="TINK.View.Account.AccountPage"
|
||||
BackgroundColor="{DynamicResource background-color}">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ViewCell xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:d="http://xamarin.com/schemas/2014/forms/design"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Contact.ContactPage"
|
||||
|
|
|
|||
|
|
@ -3,10 +3,7 @@ using System;
|
|||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
#if USEFLYOUT
|
||||
using TINK.View.MasterDetail;
|
||||
#endif
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.Contact;
|
||||
using Xamarin.Essentials;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
|
|
|||
131
TINK/TINK/View/Help/HelpPage.xaml
Normal file
131
TINK/TINK/View/Help/HelpPage.xaml
Normal file
|
|
@ -0,0 +1,131 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage
|
||||
xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
x:Class="TINK.View.Help.HelpPage"
|
||||
Style="{StaticResource TabbedPageStyle}">
|
||||
|
||||
<TabbedPage.Resources>
|
||||
<x:String x:Key="IconSmartphone"></x:String>
|
||||
<x:String x:Key="IconTariff"></x:String>
|
||||
<x:String x:Key="IconFaq"></x:String>
|
||||
</TabbedPage.Resources>
|
||||
|
||||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingHelp}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
<!--Pages can be added as references or in line-->
|
||||
<ContentPage
|
||||
x:Name="FaqPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="FAQ">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconFaq}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="FaqWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding FaqHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
x:Name="ManualPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabManual}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconSmartphone}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="ManualWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding ManualHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
<ContentPage
|
||||
x:Name="TariffPage"
|
||||
IsEnabled="{Binding IsIdle}"
|
||||
Title="{x:Static resources:AppResources.MarkingTabTariffs}">
|
||||
<ContentPage.IconImageSource>
|
||||
<FontImageSource Glyph="{StaticResource IconTariff}" FontFamily="FA-S" />
|
||||
</ContentPage.IconImageSource>
|
||||
<ContentPage.Content>
|
||||
<Grid
|
||||
RowDefinitions="Auto,*,Auto"
|
||||
RowSpacing="0">
|
||||
<BoxView Grid.Row="0"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="TariffsWebView"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000"
|
||||
Source="{Binding TariffsHtml}"/>
|
||||
<BoxView Grid.Row="2"
|
||||
HeightRequest="1"
|
||||
WidthRequest="400"
|
||||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<ActivityIndicator Grid.Row="0" Grid.RowSpan="3"
|
||||
IsRunning="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
IsVisible="{Binding IsIdle, Converter={StaticResource InvertedBoolConverter}}"
|
||||
Scale="2"
|
||||
VerticalOptions="CenterAndExpand"
|
||||
HorizontalOptions="CenterAndExpand"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
</Grid>
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
</TabbedPage>
|
||||
53
TINK/TINK/View/Help/HelpPage.xaml.cs
Normal file
53
TINK/TINK/View/Help/HelpPage.xaml.cs
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
using System.Globalization;
|
||||
using Serilog;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.Help;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.Help
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class HelpPage : TabbedPage
|
||||
{
|
||||
public HelpPageViewModel ViewModel { get; }
|
||||
|
||||
public HelpPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
/// Info about renting.
|
||||
TariffsWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
TariffsWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Mietinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
/// Info about types of bikes.
|
||||
ManualWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
|
||||
ManualWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Radinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
ViewModel = new HelpPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.TariffsResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ManualResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
|
||||
this.BindingContext = ViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Called when page is shown. </summary>
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
ViewModel.OnAppearing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<TabbedPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.Info.InfoPage"
|
||||
x:Class="TINK.View.LegalInformation.LegalInformationPage"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
Style="{StaticResource TabbedPageStyle}"
|
||||
x:Name="TabbedInfoPage">
|
||||
Style="{StaticResource TabbedPageStyle}">
|
||||
|
||||
<TabbedPage.Resources>
|
||||
<x:String x:Key="IconSmartphone"></x:String>
|
||||
|
|
@ -16,7 +15,7 @@
|
|||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingAbout}"/>
|
||||
Text="{x:Static resources:AppResources.MarkingLegalInformation}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
|
|
@ -38,7 +37,7 @@
|
|||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="InfoLicenses"
|
||||
Source="{Binding InfoLicenses}"
|
||||
Source="{Binding AppHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
|
|
@ -72,8 +71,8 @@
|
|||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="InfoDatenschutz"
|
||||
Source="{Binding InfoPrivacy}"
|
||||
x:Name="PrivacyWebView"
|
||||
Source="{Binding PrivacyHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
|
|
@ -107,8 +106,8 @@
|
|||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="InfoABG"
|
||||
Source ="{Binding InfoAgb}"
|
||||
x:Name="GtcWebView"
|
||||
Source ="{Binding GtcHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
|
|
@ -142,8 +141,8 @@
|
|||
HorizontalOptions="Center"
|
||||
Color="{x:DynamicResource primary-back-title-color}"/>
|
||||
<WebView Grid.Row="1"
|
||||
x:Name="InfoImpressum"
|
||||
Source="{Binding InfoImpressum}"
|
||||
x:Name="ImpressWebView"
|
||||
Source="{Binding ImpressHtml}"
|
||||
HeightRequest="1000"
|
||||
WidthRequest="1000" />
|
||||
<BoxView Grid.Row="2"
|
||||
60
TINK/TINK/View/LegalInformation/LegalInformationPage.xaml.cs
Normal file
60
TINK/TINK/View/LegalInformation/LegalInformationPage.xaml.cs
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
using System.Globalization;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.LegalInformation
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class LegalInformationPage : TabbedPage
|
||||
{
|
||||
public LegalInformationPageViewModel ViewModel { get; }
|
||||
|
||||
public LegalInformationPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
ViewModel = new LegalInformationPageViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.ResourceUrls.GtcResourcePath,
|
||||
App.ModelRoot.ResourceUrls.PrivacyResourcePath,
|
||||
App.ModelRoot.ResourceUrls.ImpressResourcePath,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
resourceName => ViewModelResourceHelper.GetSource(resourceName),
|
||||
() => App.ModelRoot.GetConnector(App.ModelRoot.GetIsConnected()).Query,
|
||||
resourceUrls => App.ModelRoot.ResourceUrls = resourceUrls);
|
||||
this.BindingContext = ViewModel;
|
||||
|
||||
InfoLicenses.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
InfoLicenses.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Lizenzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
PrivacyWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
PrivacyWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Datenschutzinformationen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
GtcWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
GtcWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann allgemeine Geschäftsbedingungen nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
|
||||
ImpressWebView.Navigating += WebViewHelper.SelectDisplayTarget;
|
||||
ImpressWebView.Navigated += (sender, ev) => WebViewHelper.HandleError(
|
||||
sender,
|
||||
ev,
|
||||
"<html><b>Kann Impressum nicht anzeigen!</b><br>Verbindung mit Internet ok?</html>");
|
||||
}
|
||||
|
||||
/// <summary> Called when page is shown. </summary>
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
ViewModel.OnAppearing();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
|
||||
xmlns:conv="clr-namespace:TINK.View"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
x:Class="TINK.View.Login.LoginPage"
|
||||
BackgroundColor="{DynamicResource background-color}">
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<Shell.TitleView >
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingMapPage}"/>
|
||||
Text="{x:Static resources:AppResources.MarkingBikeLocations}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,14 @@
|
|||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:mappage="clr-namespace:TINK.View.Map"
|
||||
xmlns:findbike="clr-namespace:TINK.View.FindBike"
|
||||
xmlns:findbike="clr-namespace:TINK.View.SelectBike"
|
||||
xmlns:mybikes="clr-namespace:TINK.View.MyBikes"
|
||||
xmlns:account="clr-namespace:TINK.View.Account"
|
||||
xmlns:login="clr-namespace:TINK.View.Login"
|
||||
xmlns:settings="clr-namespace:TINK.View.Settings"
|
||||
xmlns:contact="clr-namespace:TINK.View.Contact"
|
||||
xmlns:info="clr-namespace:TINK.View.Info"
|
||||
xmlns:help="clr-namespace:TINK.View.Help"
|
||||
xmlns:info="clr-namespace:TINK.View.LegalInformation"
|
||||
xmlns:header="clr-namespace:TINK.View.RootShell"
|
||||
xmlns:version="clr-namespace:ShareeSharedGuiLib.View"
|
||||
BackgroundColor="{DynamicResource Key=primary-back-title-color}"
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingMapPage}"
|
||||
Title="{x:Static resources:AppResources.MarkingBikeLocations}"
|
||||
Route="MapPage"
|
||||
ContentTemplate="{DataTemplate mappage:MapPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -31,11 +32,11 @@
|
|||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFindBike}"
|
||||
IsVisible="{Binding IsFindBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:FindBikePage}">
|
||||
Title="{x:Static resources:AppResources.MarkingSelectBike}"
|
||||
IsVisible="{Binding IsSelectBikePageVisible}"
|
||||
ContentTemplate="{DataTemplate findbike:SelectBikePage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFindBike}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
|
||||
<FontImageSource Glyph="{StaticResource IconSelectBike}" Color="{DynamicResource Key=primary-back-title-color}" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
|
|
@ -72,7 +73,7 @@
|
|||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}"
|
||||
Title="{x:Static resources:AppResources.MarkingContact}"
|
||||
Route="ContactPage"
|
||||
ContentTemplate="{DataTemplate contact:ContactPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
|
|
@ -92,17 +93,17 @@
|
|||
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{x:Static resources:AppResources.MarkingFeesAndBikes}"
|
||||
ContentTemplate="{DataTemplate contact:FeesAndBikesPage}">
|
||||
Title="{x:Static resources:AppResources.MarkingHelp}"
|
||||
ContentTemplate="{DataTemplate help:HelpPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconFeesAndBikes}" Color="DimGray" FontFamily="FA-S"/>
|
||||
<FontImageSource Glyph="{StaticResource IconHelp}" Color="DimGray" FontFamily="FA-S"/>
|
||||
</ShellContent.FlyoutIcon>
|
||||
</ShellContent>
|
||||
</FlyoutItem>
|
||||
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
|
||||
<ShellContent
|
||||
Title="{Binding TabbedPageIngoTitle}"
|
||||
ContentTemplate="{DataTemplate info:InfoPage}">
|
||||
Title="{x:Static resources:AppResources.MarkingLegalInformation}"
|
||||
ContentTemplate="{DataTemplate info:LegalInformationPage}">
|
||||
<ShellContent.FlyoutIcon>
|
||||
<FontImageSource Glyph="{StaticResource IconLegalInfo}" Color="DimGray" FontFamily="FA-S" />
|
||||
</ShellContent.FlyoutIcon>
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
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"
|
||||
x:Class="TINK.View.SelectBike.SelectBikePage"
|
||||
xmlns:conv="clr-namespace:TINK.View;assembly=TINKLib"
|
||||
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
|
||||
xmlns:rental_process="clr-namespace:TINK.ViewModel.Bikes;assembly=TINKLib"
|
||||
xmlns:bikeRentalProcess="clr-namespace:ShareeSharedGuiLib.View.Bike.RentalProcess"
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<Shell.TitleView>
|
||||
<Grid ColumnDefinitions="Auto, 1*">
|
||||
<Label Style="{StaticResource Label-Navbar}"
|
||||
Text="{x:Static resources:AppResources.MarkingFindBike}"/>
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBike}"/>
|
||||
</Grid>
|
||||
</Shell.TitleView>
|
||||
|
||||
|
|
@ -66,14 +66,14 @@
|
|||
Grid.Column="0"
|
||||
Grid.ColumnSpan="2"
|
||||
Grid.Row="0"
|
||||
Text="{x:Static resources:AppResources.MarkingFindBikeLabel}"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBikeLabel}"
|
||||
Margin="0,5,0,-5">
|
||||
</Label>
|
||||
<Entry
|
||||
Grid.Column="0"
|
||||
Grid.Row="1"
|
||||
x:Name="FindBikeEntry"
|
||||
Placeholder="{x:Static resources:AppResources.PlaceholderFindBike}"
|
||||
x:Name="SelectBikeEntry"
|
||||
Placeholder="{x:Static resources:AppResources.PlaceholderSelectBike}"
|
||||
MaxLength="10"
|
||||
CursorPosition="0"
|
||||
Text="{Binding BikeIdUserInput, Mode=TwoWay}"/>
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
Grid.Column="1"
|
||||
Grid.Row="1"
|
||||
WidthRequest="100"
|
||||
Text="{x:Static resources:AppResources.MarkingFindBikeButton}"
|
||||
Text="{x:Static resources:AppResources.MarkingSelectBikeButton}"
|
||||
Command="{Binding OnSelectBikeRequest}">
|
||||
<Button.Triggers>
|
||||
<DataTrigger TargetType="Button" Binding="{Binding IsSelectBikeEnabled}" Value="False">
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
<!--Bike-->
|
||||
<ListView
|
||||
Grid.Row="1"
|
||||
x:Name="FindBikeListView"
|
||||
x:Name="SelectBikeListView"
|
||||
BackgroundColor="{DynamicResource background-color}"
|
||||
SelectionMode="None"
|
||||
SelectedItem="{Binding SelectedBike}"
|
||||
|
|
@ -5,25 +5,25 @@ using Serilog;
|
|||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.Model.Device;
|
||||
using TINK.MultilingualResources;
|
||||
using TINK.ViewModel.FindBike;
|
||||
using TINK.ViewModel.SelectBike;
|
||||
using Xamarin.CommunityToolkit.Extensions;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.FindBike
|
||||
namespace TINK.View.SelectBike
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class FindBikePage : ContentPage, IViewService
|
||||
public partial class SelectBikePage : ContentPage, IViewService
|
||||
{
|
||||
/// <summary> Refernce to view model. </summary>
|
||||
FindBikePageViewModel m_oViewModel = null;
|
||||
/// <summary> Reference to view model. </summary>
|
||||
SelectBikePageViewModel m_oViewModel = null;
|
||||
|
||||
/// <summary>
|
||||
/// Holds a value indicating whether page already subscribed to shell item changes or not.
|
||||
/// </summary>
|
||||
private bool _IsShellItemChangedReceived = false;
|
||||
|
||||
public FindBikePage() { }
|
||||
public SelectBikePage() { }
|
||||
|
||||
/// <summary>
|
||||
/// Invoked when page is shown.
|
||||
|
|
@ -43,7 +43,7 @@ namespace TINK.View.FindBike
|
|||
{
|
||||
var model = App.ModelRoot;
|
||||
|
||||
m_oViewModel = new FindBikePageViewModel(
|
||||
m_oViewModel = new SelectBikePageViewModel(
|
||||
model.ActiveUser,
|
||||
model,
|
||||
App.PermissionsService,
|
||||
|
|
@ -65,7 +65,7 @@ namespace TINK.View.FindBike
|
|||
}
|
||||
catch (Exception exception)
|
||||
{
|
||||
Log.ForContext<FindBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
|
||||
Log.ForContext<SelectBikePage>().Error("Displaying bikes at station page failed. {Exception}", exception);
|
||||
await DisplayAlert(
|
||||
AppResources.ErrorPageNotLoadedTitle,
|
||||
$"{AppResources.ErrorPageNotLoaded}\r\n{exception.Message}",
|
||||
|
|
@ -79,7 +79,7 @@ namespace TINK.View.FindBike
|
|||
|
||||
|
||||
BindingContext = m_oViewModel;
|
||||
FindBikeListView.ItemsSource = m_oViewModel;
|
||||
SelectBikeListView.ItemsSource = m_oViewModel;
|
||||
|
||||
await m_oViewModel.OnAppearingOrRefresh();
|
||||
}
|
||||
|
|
@ -2,15 +2,16 @@ using System;
|
|||
using TINK.View.BikesAtStation;
|
||||
using TINK.View.Contact;
|
||||
using TINK.View.CopriWebView;
|
||||
using TINK.View.FindBike;
|
||||
using TINK.View.Info;
|
||||
using TINK.View.SelectBike;
|
||||
using TINK.View.LegalInformation;
|
||||
using TINK.View.Help;
|
||||
using TINK.View.Login;
|
||||
using TINK.View.Map;
|
||||
using TINK.View.MiniSurvey;
|
||||
using TINK.View.MyBikes;
|
||||
using TINK.View.Settings;
|
||||
using TINK.View.WhatsNew;
|
||||
using TINK.View.WhatsNew.Agb;
|
||||
using TINK.View.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
|
||||
namespace TINK.View
|
||||
|
|
@ -39,17 +40,17 @@ namespace TINK.View
|
|||
case ViewTypes.SettingsPage:
|
||||
return typeof(SettingsPage);
|
||||
|
||||
case ViewTypes.TabbedPageInfo:
|
||||
return typeof(InfoPage);
|
||||
case ViewTypes.LegalInformationPage:
|
||||
return typeof(LegalInformationPage);
|
||||
|
||||
case ViewTypes.FeesAndBikesPage:
|
||||
return typeof(FeesAndBikesPage);
|
||||
case ViewTypes.HelpPage:
|
||||
return typeof(HelpPage);
|
||||
|
||||
case ViewTypes.ManageAccountPage:
|
||||
return typeof(ManageAccountPage);
|
||||
|
||||
case ViewTypes.AgbPage:
|
||||
return typeof(AgbPage);
|
||||
case ViewTypes.GtcPage:
|
||||
return typeof(GtcPage);
|
||||
|
||||
case ViewTypes.WhatsNewPage:
|
||||
return typeof(WhatsNewPage);
|
||||
|
|
@ -66,8 +67,8 @@ namespace TINK.View
|
|||
case ViewTypes.MiniSurvey:
|
||||
return typeof(MiniSurveyPage);
|
||||
|
||||
case ViewTypes.FindBikePage:
|
||||
return typeof(FindBikePage);
|
||||
case ViewTypes.SelectBikePage:
|
||||
return typeof(SelectBikePage);
|
||||
|
||||
default:
|
||||
return typeof(ContentPage);
|
||||
|
|
|
|||
21
TINK/TINK/View/WhatsNew/Gtc/GtcPage.xaml
Normal file
21
TINK/TINK/View/WhatsNew/Gtc/GtcPage.xaml
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
|
||||
x:Class="TINK.View.WhatsNew.Gtc.GtcPage">
|
||||
<ContentPage.Content>
|
||||
<Frame>
|
||||
<StackLayout>
|
||||
<WebView
|
||||
HeightRequest="1000"
|
||||
WidthRequest="500"
|
||||
Source="{Binding GtcHtml}"/>
|
||||
<Button
|
||||
Text="OK"
|
||||
WidthRequest="100"
|
||||
Command="{Binding OnOk}"
|
||||
Margin="0,0,0,3"/>
|
||||
</StackLayout>
|
||||
</Frame>
|
||||
|
||||
</ContentPage.Content>
|
||||
</ContentPage>
|
||||
78
TINK/TINK/View/WhatsNew/Gtc/GtcPage.xaml.cs
Normal file
78
TINK/TINK/View/WhatsNew/Gtc/GtcPage.xaml.cs
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
using System;
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
|
||||
using TINK.ViewModel;
|
||||
using TINK.ViewModel.WhatsNew.Gtc;
|
||||
using Xamarin.Forms;
|
||||
using Xamarin.Forms.Xaml;
|
||||
|
||||
namespace TINK.View.WhatsNew.Gtc
|
||||
{
|
||||
[XamlCompilation(XamlCompilationOptions.Compile)]
|
||||
public partial class GtcPage : ContentPage, IViewService
|
||||
{
|
||||
public GtcPage()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
gtcViewModel = new GtcViewModel(
|
||||
App.ModelRoot.NextActiveUri.Host,
|
||||
App.ModelRoot.IsSiteCachingOn,
|
||||
(resourceName) => ViewModelResourceHelper.GetSource(resourceName),
|
||||
this);
|
||||
|
||||
this.BindingContext = gtcViewModel;
|
||||
}
|
||||
|
||||
/// <summary> Displays alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="cancel">Type of buttons.</param>
|
||||
public async Task DisplayAdvancedAlert(
|
||||
string title,
|
||||
string message,
|
||||
string details,
|
||||
string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, $"{message}\r\nDetails:\r\n{details}", cancel);
|
||||
|
||||
/// <summary> Displays detailed alert message.</summary>
|
||||
/// <param name="title">Title of message.</param>
|
||||
/// <param name="message">Message to display.</param>
|
||||
/// <param name="details">Detailed error description.</param>
|
||||
/// <param name="accept">Text of accept button.</param>
|
||||
/// <param name="cancel">Text of cancel button.</param>
|
||||
/// <returns>True if user pressed accept.</returns>
|
||||
public async Task<bool> DisplayAdvancedAlert(string title, string message, string details, string accept, string cancel)
|
||||
=> await App.Current.MainPage.DisplayAlert(title, !string.IsNullOrEmpty(details) ? $"{message}\r\nDetails:\r\n{details}" : $"{message}", accept, cancel);
|
||||
|
||||
/// <summary> Invoked when page is shown. </summary>
|
||||
protected async override void OnAppearing()
|
||||
=> await gtcViewModel.OnAppearing();
|
||||
|
||||
/// <summary> Reference to view model.</summary>
|
||||
GtcViewModel gtcViewModel;
|
||||
|
||||
public async Task PopModalAsync()
|
||||
=> await Navigation.PopModalAsync();
|
||||
|
||||
/// <summary> Pushes a page onto the stack. </summary>
|
||||
/// <param name="p_oTypeOfPage">Page to display.</param>
|
||||
public Task PushAsync(ViewTypes p_oTypeOfPage)
|
||||
=> throw new NotImplementedException();
|
||||
|
||||
public Task PushModalAsync(ViewTypes p_oTypeOfPage)
|
||||
=> throw new NotImplementedException();
|
||||
|
||||
/// <summary> Shows a page.</summary>
|
||||
/// <param name="route">Route of the page to show.</param>
|
||||
public async Task ShowPage(string route) => await Shell.Current.GoToAsync(route);
|
||||
|
||||
#if USCSHARP9
|
||||
public Task<IViewService.IUserFeedback> DisplayUserFeedbackPopup() => throw new NotSupportedException();
|
||||
#else
|
||||
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBatteryMutable battery = null) => throw new NotSupportedException();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@ using TINK.MultilingualResources;
|
|||
using TINK.Services;
|
||||
using TINK.Services.CopriApi.ServerUris;
|
||||
using TINK.View.Themes;
|
||||
using TINK.ViewModel.Info;
|
||||
using TINK.ViewModel.LegalInformation;
|
||||
|
||||
namespace TINK.ViewModel.RootShell
|
||||
{
|
||||
|
|
@ -15,7 +15,7 @@ namespace TINK.ViewModel.RootShell
|
|||
{
|
||||
// Login state changed. Update related menu entries.
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsMyBikesPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSelectBikePageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
|
||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
|
||||
};
|
||||
|
|
@ -56,13 +56,13 @@ namespace TINK.ViewModel.RootShell
|
|||
|
||||
public bool IsMyBikesPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsFindBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
public bool IsSelectBikePageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsAccountPageVisible => App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
|
||||
|
||||
public string TabbedPageIngoTitle => AppResources.MarkingAbout;
|
||||
public string TabbedPageIngoTitle => AppResources.MarkingLegalInformation;
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using TINK.Model.Bikes;
|
||||
|
||||
|
|
@ -15,20 +15,16 @@ namespace TINK.Model
|
|||
public static BikeCollection GetAtStation(
|
||||
this BikeCollection bikesAtAnyStation,
|
||||
string selectedStation)
|
||||
{
|
||||
return new BikeCollection(bikesAtAnyStation?
|
||||
=> new BikeCollection(bikesAtAnyStation?
|
||||
.Where(bike => !string.IsNullOrEmpty(selectedStation) && bike.StationId == selectedStation)
|
||||
.ToDictionary(bike => bike.Id) ?? new Dictionary<string, BikeInfo>());
|
||||
}
|
||||
|
||||
/// <summary> Filters bikes by bike type. </summary>
|
||||
/// <param name="bcAndLockItBikes">Bikes available, requested and/ or occupied bikes to filter.</param>
|
||||
/// <returns>BikeCollection holding LockIt-bikes empty BikeCollection, if there are no LockIt-bikes.</returns>
|
||||
public static BikeCollection GetLockIt(this BikeCollection bcAndLockItBikes)
|
||||
{
|
||||
return new BikeCollection(bcAndLockItBikes?
|
||||
=> new BikeCollection(bcAndLockItBikes?
|
||||
.Where(bike => bike is Bikes.BikeInfoNS.BluetoothLock.BikeInfo)
|
||||
.ToDictionary(x => x.Id) ?? new Dictionary<string, BikeInfo>());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,9 +65,11 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var result = await m_oInnerQuery.GetBikesAsync(operatorUri);
|
||||
var result = await m_oInnerQuery.GetBikesAsync(operatorUri, stationId, bikeId);
|
||||
return new Result<BikeCollection>(
|
||||
result.Source,
|
||||
new BikeCollection(DoFilter(result.Response, Filter)),
|
||||
|
|
|
|||
|
|
@ -57,9 +57,11 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var result = await m_oInnerQuery.GetBikesAsync(operatorUri);
|
||||
var result = await m_oInnerQuery.GetBikesAsync(operatorUri, stationId, bikeId);
|
||||
return new Result<BikeCollection>(
|
||||
result.Source,
|
||||
new BikeCollection(result.Response.ToDictionary(x => x.Id)),
|
||||
|
|
|
|||
|
|
@ -72,17 +72,18 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes available. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <returns>Collection of bikes.</returns>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var result = await server.GetBikesAvailable(operatorUri: operatorUri);
|
||||
var result = await server.GetBikesAvailable(operatorUri: operatorUri, stationId: stationId, bikeId: bikeId);
|
||||
|
||||
if (result.Source != typeof(CopriCallsMonkeyStore))
|
||||
{
|
||||
server.AddToCache(result, operatorUri);
|
||||
server.AddToCache(result, operatorUri, stationId, bikeId);
|
||||
}
|
||||
|
||||
|
||||
return new Result<BikeCollection>(
|
||||
result.Source,
|
||||
result.Response.GetBikesAvailable(result.Source == typeof(CopriCallsMonkeyStore)
|
||||
|
|
|
|||
|
|
@ -128,10 +128,12 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes available and bikes occupied. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <returns>Collection of bikes.</returns>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var bikesAvailableResponse = await Server.GetBikesAvailable(operatorUri: operatorUri);
|
||||
var bikesAvailableResponse = await Server.GetBikesAvailable(operatorUri: operatorUri, stationId: stationId, bikeId: bikeId);
|
||||
|
||||
if (bikesAvailableResponse.Source == typeof(CopriCallsMonkeyStore)
|
||||
|| bikesAvailableResponse.Exception != null)
|
||||
|
|
@ -155,7 +157,7 @@ namespace TINK.Model.Connector
|
|||
if (operatorUri?.AbsoluteUri != null)
|
||||
{
|
||||
// Both types bikes could read from copri successfully => update cache
|
||||
Server.AddToCache(bikesAvailableResponse, operatorUri);
|
||||
Server.AddToCache(bikesAvailableResponse, operatorUri, stationId, bikeId);
|
||||
|
||||
Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available and occupied read successfully from server invoking one single request.");
|
||||
return new Result<BikeCollection>(
|
||||
|
|
@ -181,7 +183,7 @@ namespace TINK.Model.Connector
|
|||
return new Result<BikeCollection>(
|
||||
bikesOccupiedResponse.Source,
|
||||
BikeCollectionFactory.GetBikesAll(
|
||||
(await Server.GetBikesAvailable(true, operatorUri)).Response?.bikes?.Values,
|
||||
(await Server.GetBikesAvailable(true, operatorUri, stationId, bikeId)).Response?.bikes?.Values,
|
||||
bikesOccupiedResponse.Response?.bikes_occupied?.Values,
|
||||
Mail,
|
||||
DateTimeProvider,
|
||||
|
|
@ -191,7 +193,7 @@ namespace TINK.Model.Connector
|
|||
}
|
||||
|
||||
// Both types bikes could read from copri => update cache
|
||||
Server.AddToCache(bikesAvailableResponse, operatorUri);
|
||||
Server.AddToCache(bikesAvailableResponse, operatorUri, stationId, bikeId);
|
||||
Server.AddToCache(bikesOccupiedResponse);
|
||||
|
||||
Log.ForContext<CachedQueryLoggedIn>().Debug("Bikes available and occupied read successfully from server.");
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes either bikes available if no user is logged in or bikes available and bikes occupied if a user is logged in. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <returns>Collection of bikes.</returns>
|
||||
Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null);
|
||||
Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,14 +55,18 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes occupied. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <returns> Collection of bikes. </returns>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var bikesAvailableResponse = await server.GetBikesAvailableAsync(operatorUri);
|
||||
var bikesAvailableResponse = await server.GetBikesAvailableAsync(operatorUri, stationId, bikeId);
|
||||
return new Result<BikeCollection>(
|
||||
typeof(CopriCallsMonkeyStore),
|
||||
bikesAvailableResponse.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Cache),
|
||||
bikesAvailableResponse.GetGeneralData());
|
||||
bikesAvailableResponse != null
|
||||
? bikesAvailableResponse.GetBikesAvailable(Bikes.BikeInfoNS.BC.DataSource.Cache)
|
||||
: await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
|
||||
bikesAvailableResponse?.GetGeneralData());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,10 +70,26 @@ namespace TINK.Model.Connector
|
|||
|
||||
/// <summary> Gets bikes available and bikes occupied. </summary>
|
||||
/// <param name="operatorUri">Uri of the operator host to get bikes from or null if bikes have to be gotten form primary host.</param>
|
||||
/// <param name="stationId"> Id of station which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <param name="bikeId"> Id of bike which is used for filtering bikes. Null if no filtering should be applied.</param>
|
||||
/// <returns>Collection of bikes.</returns>
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null)
|
||||
public async Task<Result<BikeCollection>> GetBikesAsync(Uri operatorUri = null, string stationId = null, string bikeId = null)
|
||||
{
|
||||
var bikesAvailableResponse = await server.GetBikesAvailableAsync(operatorUri);
|
||||
var bikesAvailableResponse = await server.GetBikesAvailableAsync(operatorUri, stationId, bikeId);
|
||||
|
||||
if (operatorUri?.AbsoluteUri != null)
|
||||
{
|
||||
return new Result<BikeCollection>(
|
||||
typeof(CopriCallsMonkeyStore),
|
||||
BikeCollectionFactory.GetBikesAll(
|
||||
bikesAvailableResponse?.bikes?.Values,
|
||||
bikesAvailableResponse?.bikes_occupied?.Values,
|
||||
Mail,
|
||||
DateTimeProvider,
|
||||
Bikes.BikeInfoNS.BC.DataSource.Cache),
|
||||
bikesAvailableResponse?.GetGeneralData());
|
||||
}
|
||||
|
||||
var bikesOccupiedResponse = await server.GetBikesOccupiedAsync();
|
||||
|
||||
return new Result<BikeCollection>(
|
||||
|
|
@ -84,7 +100,7 @@ namespace TINK.Model.Connector
|
|||
Mail,
|
||||
DateTimeProvider,
|
||||
Bikes.BikeInfoNS.BC.DataSource.Cache),
|
||||
bikesAvailableResponse.GetGeneralData());
|
||||
bikesAvailableResponse?.GetGeneralData());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,11 +122,11 @@ namespace TINK.Model
|
|||
|
||||
public interface IResourceUrls
|
||||
{
|
||||
string FeesResourcePath { get; }
|
||||
string TariffsResourcePath { get; }
|
||||
|
||||
string BikesResourcePath { get; }
|
||||
string ManualResourcePath { get; }
|
||||
|
||||
string AgbResourcePath { get; }
|
||||
string GtcResourcePath { get; }
|
||||
|
||||
string PrivacyResourcePath { get; }
|
||||
|
||||
|
|
|
|||
|
|
@ -3,24 +3,24 @@ namespace TINK.Model
|
|||
public class ResourceUrls : IResourceUrls
|
||||
{
|
||||
public ResourceUrls(
|
||||
string feesResourcePath = null,
|
||||
string bikesResourcePath = null,
|
||||
string agbResourcePath = null,
|
||||
string tariffsResourcePath = null,
|
||||
string manualResourcePath = null,
|
||||
string gtcResourcePath = null,
|
||||
string privacyResourcePath = null,
|
||||
string impressResourcePath = null)
|
||||
{
|
||||
FeesResourcePath = !string.IsNullOrEmpty(feesResourcePath) ? feesResourcePath : "";
|
||||
BikesResourcePath = !string.IsNullOrEmpty(bikesResourcePath) ? bikesResourcePath : "";
|
||||
AgbResourcePath = !string.IsNullOrEmpty(agbResourcePath) ? agbResourcePath : "";
|
||||
TariffsResourcePath = !string.IsNullOrEmpty(tariffsResourcePath) ? tariffsResourcePath : "";
|
||||
ManualResourcePath = !string.IsNullOrEmpty(manualResourcePath) ? manualResourcePath : "";
|
||||
GtcResourcePath = !string.IsNullOrEmpty(gtcResourcePath) ? gtcResourcePath : "";
|
||||
PrivacyResourcePath = !string.IsNullOrEmpty(privacyResourcePath) ? privacyResourcePath : "";
|
||||
ImpressResourcePath = !string.IsNullOrEmpty(impressResourcePath) ? impressResourcePath : "";
|
||||
}
|
||||
|
||||
public string FeesResourcePath { get; }
|
||||
public string TariffsResourcePath { get; }
|
||||
|
||||
public string BikesResourcePath { get; }
|
||||
public string ManualResourcePath { get; }
|
||||
|
||||
public string AgbResourcePath { get; }
|
||||
public string GtcResourcePath { get; }
|
||||
|
||||
public string PrivacyResourcePath { get; }
|
||||
|
||||
|
|
|
|||
|
|
@ -733,7 +733,7 @@ namespace TINK.Model
|
|||
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
|
||||
},
|
||||
{
|
||||
new Version(3, 0, 375),
|
||||
new Version(3, 0, 376),
|
||||
string.Format("{0} <br /> {1} <br /> {2}", AppResources.ChangeLog_MinorImprovements, AppResources.ChangeLog_PackageUpdates, AppResources.ChangeLog_MinorBugFixes),
|
||||
new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
|
||||
},
|
||||
|
|
|
|||
260
TINKLib/MultilingualResources/AppResources.Designer.cs
generated
260
TINKLib/MultilingualResources/AppResources.Designer.cs
generated
|
|
@ -60,15 +60,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Rent bike.
|
||||
/// </summary>
|
||||
public static string ActionRentBike {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionRentBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Cancel reservation.
|
||||
/// </summary>
|
||||
|
|
@ -105,6 +96,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to End rental.
|
||||
/// </summary>
|
||||
public static string ActionEndRental {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionEndRental", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Give feedback.
|
||||
/// </summary>
|
||||
|
|
@ -150,15 +150,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Open lock & rent bike.
|
||||
/// </summary>
|
||||
public static string ActionOpenLockAndRentBike {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionOpenLockAndRentBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Open lock.
|
||||
/// </summary>
|
||||
|
|
@ -168,6 +159,24 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Open lock & rent bike.
|
||||
/// </summary>
|
||||
public static string ActionOpenLockAndRentBike {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionOpenLockAndRentBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Rent bike.
|
||||
/// </summary>
|
||||
public static string ActionRentBike {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionRentBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Reserve bike.
|
||||
/// </summary>
|
||||
|
|
@ -177,15 +186,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to End rental.
|
||||
/// </summary>
|
||||
public static string ActionEndRental {
|
||||
get {
|
||||
return ResourceManager.GetString("ActionEndRental", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Search lock.
|
||||
/// </summary>
|
||||
|
|
@ -438,15 +438,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Loading Bikes....
|
||||
/// </summary>
|
||||
public static string ActivityTextFindBikeLoadingBikes {
|
||||
get {
|
||||
return ResourceManager.GetString("ActivityTextFindBikeLoadingBikes", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Lock out of reach.
|
||||
/// </summary>
|
||||
|
|
@ -600,6 +591,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Loading Bikes....
|
||||
/// </summary>
|
||||
public static string ActivityTextSelectBikeLoadingBikes {
|
||||
get {
|
||||
return ResourceManager.GetString("ActivityTextSelectBikeLoadingBikes", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Updating....
|
||||
/// </summary>
|
||||
|
|
@ -2091,15 +2091,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Legal Information.
|
||||
/// </summary>
|
||||
public static string MarkingAbout {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingAbout", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Account.
|
||||
/// </summary>
|
||||
|
|
@ -2183,6 +2174,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bike Locations.
|
||||
/// </summary>
|
||||
public static string MarkingBikeLocations {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingBikeLocations", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to There are currently no bicycles available at this station..
|
||||
/// </summary>
|
||||
|
|
@ -2246,6 +2246,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Contact.
|
||||
/// </summary>
|
||||
public static string MarkingContact {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingContact", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Customer support.
|
||||
/// </summary>
|
||||
|
|
@ -2328,29 +2337,56 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Contact.
|
||||
/// Looks up a localized string similar to Menu.
|
||||
/// </summary>
|
||||
public static string MarkingFeedbackAndContact {
|
||||
public static string MarkingFlyoutHeader {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingFeedbackAndContact", resourceCulture);
|
||||
return ResourceManager.GetString("MarkingFlyoutHeader", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Geolocation Control.
|
||||
/// </summary>
|
||||
public static string MarkingGeolocationControl {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingGeolocationControl", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Help.
|
||||
/// </summary>
|
||||
public static string MarkingFeesAndBikes {
|
||||
public static string MarkingHelp {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingFeesAndBikes", resourceCulture);
|
||||
return ResourceManager.GetString("MarkingHelp", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Select Bike.
|
||||
/// Looks up a localized string similar to Last selected station.
|
||||
/// </summary>
|
||||
public static string MarkingFindBike {
|
||||
public static string MarkingLastSelectedStation {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingFindBike", resourceCulture);
|
||||
return ResourceManager.GetString("MarkingLastSelectedStation", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Legal information.
|
||||
/// </summary>
|
||||
public static string MarkingLegalInformation {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingLegalInformation", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Lock control.
|
||||
/// </summary>
|
||||
public static string MarkingLockControl {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingLockControl", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2381,42 +2417,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Menu.
|
||||
/// </summary>
|
||||
public static string MarkingFlyoutHeader {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingFlyoutHeader", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Geolocation Control.
|
||||
/// </summary>
|
||||
public static string MarkingGeolocationControl {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingGeolocationControl", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Last selected station.
|
||||
/// </summary>
|
||||
public static string MarkingLastSelectedStation {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingLastSelectedStation", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Lock control.
|
||||
/// </summary>
|
||||
public static string MarkingLockControl {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingLockControl", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Logged in as {0}..
|
||||
/// </summary>
|
||||
|
|
@ -2535,15 +2535,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bike Locations.
|
||||
/// </summary>
|
||||
public static string MarkingMapPage {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingMapPage", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to My Bikes.
|
||||
/// </summary>
|
||||
|
|
@ -2783,11 +2774,38 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Search bike.
|
||||
/// Looks up a localized string similar to Select Bike.
|
||||
/// </summary>
|
||||
public static string MarkingSearchBike {
|
||||
public static string MarkingSelectBike {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingSearchBike", resourceCulture);
|
||||
return ResourceManager.GetString("MarkingSelectBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Search.
|
||||
/// </summary>
|
||||
public static string MarkingSelectBikeButton {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingSelectBikeButton", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Bike id.
|
||||
/// </summary>
|
||||
public static string MarkingSelectBikeLabel {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingSelectBikeLabel", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to You search a .
|
||||
/// </summary>
|
||||
public static string MarkingSelectBikeTypeOfBikeText {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingSelectBikeTypeOfBikeText", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2836,15 +2854,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Manual.
|
||||
/// </summary>
|
||||
public static string MarkingTabBikes {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingTabBikes", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to FAQ.
|
||||
/// </summary>
|
||||
|
|
@ -2854,15 +2863,6 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Tariffs.
|
||||
/// </summary>
|
||||
public static string MarkingTabFees {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingTabFees", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to GTC.
|
||||
/// </summary>
|
||||
|
|
@ -2881,6 +2881,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Manual.
|
||||
/// </summary>
|
||||
public static string MarkingTabManual {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingTabManual", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Privacy.
|
||||
/// </summary>
|
||||
|
|
@ -2890,6 +2899,15 @@ namespace TINK.MultilingualResources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Tariffs.
|
||||
/// </summary>
|
||||
public static string MarkingTabTariffs {
|
||||
get {
|
||||
return ResourceManager.GetString("MarkingTabTariffs", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Verbose error messages.
|
||||
/// </summary>
|
||||
|
|
@ -3387,9 +3405,9 @@ namespace TINK.MultilingualResources {
|
|||
/// <summary>
|
||||
/// Looks up a localized string similar to Prefix and No., e.g. TR15.
|
||||
/// </summary>
|
||||
public static string PlaceholderFindBike {
|
||||
public static string PlaceholderSelectBike {
|
||||
get {
|
||||
return ResourceManager.GetString("PlaceholderFindBike", resourceCulture);
|
||||
return ResourceManager.GetString("PlaceholderSelectBike", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
<data name="ActionEndRental" xml:space="preserve">
|
||||
<value>Miete beenden</value>
|
||||
</data>
|
||||
<data name="MarkingMapPage" xml:space="preserve">
|
||||
<data name="MarkingBikeLocations" xml:space="preserve">
|
||||
<value>Radstandorte</value>
|
||||
</data>
|
||||
<data name="MessageLoginWelcome" xml:space="preserve">
|
||||
|
|
@ -63,13 +63,10 @@
|
|||
<data name="MessageAppVersionIsOutdated" xml:space="preserve">
|
||||
<value>Diese Version der {0} App ist veraltet. Bitte auf aktuelle Version aktualisieren.</value>
|
||||
</data>
|
||||
<data name="MarkingAbout" xml:space="preserve">
|
||||
<value>Rechtliches</value>
|
||||
</data>
|
||||
<data name="MarkingAccount" xml:space="preserve">
|
||||
<value>Konto</value>
|
||||
</data>
|
||||
<data name="MarkingFeedbackAndContact" xml:space="preserve">
|
||||
<data name="MarkingContact" xml:space="preserve">
|
||||
<value>Kontakt</value>
|
||||
</data>
|
||||
<data name="MarkingLogin" xml:space="preserve">
|
||||
|
|
@ -78,16 +75,16 @@
|
|||
<data name="MarkingMyBikes" xml:space="preserve">
|
||||
<value>Meine Räder</value>
|
||||
</data>
|
||||
<data name="MarkingFeesAndBikes" xml:space="preserve">
|
||||
<data name="MarkingHelp" xml:space="preserve">
|
||||
<value>Hilfe</value>
|
||||
</data>
|
||||
<data name="MarkingSettings" xml:space="preserve">
|
||||
<value>Einstellungen</value>
|
||||
</data>
|
||||
<data name="MarkingTabBikes" xml:space="preserve">
|
||||
<data name="MarkingTabManual" xml:space="preserve">
|
||||
<value>Anleitung</value>
|
||||
</data>
|
||||
<data name="MarkingTabFees" xml:space="preserve">
|
||||
<data name="MarkingTabTariffs" xml:space="preserve">
|
||||
<value>Tarife</value>
|
||||
</data>
|
||||
<data name="ErrorLockMoving" xml:space="preserve">
|
||||
|
|
@ -511,13 +508,13 @@ Layout Anzeige Radnamen und nummern verbessert.</value>
|
|||
<data name="ChangeLog_3_0_239" xml:space="preserve">
|
||||
<value>Fehlerbehebung: Radname wird wieder korrekt angezeigt.</value>
|
||||
</data>
|
||||
<data name="MarkingFindBike" xml:space="preserve">
|
||||
<data name="MarkingSelectBike" xml:space="preserve">
|
||||
<value>Rad auswählen</value>
|
||||
</data>
|
||||
<data name="ActivityTextCheckBluetoothState" xml:space="preserve">
|
||||
<value>Prüfe Status und Berechtigungen...</value>
|
||||
</data>
|
||||
<data name="ActivityTextFindBikeLoadingBikes" xml:space="preserve">
|
||||
<data name="ActivityTextSelectBikeLoadingBikes" xml:space="preserve">
|
||||
<value>Lade Räder...</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_240" xml:space="preserve">
|
||||
|
|
@ -863,7 +860,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
|
|||
<data name="QuestionSupportmailAttachmentTitle" xml:space="preserve">
|
||||
<value>Einwilligung</value>
|
||||
</data>
|
||||
<data name="PlaceholderFindBike" xml:space="preserve">
|
||||
<data name="PlaceholderSelectBike" xml:space="preserve">
|
||||
<value>Präfix und Nr., z.B. TR15</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_339_MK" xml:space="preserve">
|
||||
|
|
@ -1008,12 +1005,9 @@ Außerdem:<br/>
|
|||
- Fehlerbehebungen<br/>
|
||||
- Paketaktualisierungen</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeLabel" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeLabel" xml:space="preserve">
|
||||
<value>Fahrrad-ID</value>
|
||||
</data>
|
||||
<data name="MarkingSearchBike" xml:space="preserve">
|
||||
<value>Rad suchen</value>
|
||||
</data>
|
||||
<data name="MarkingReturnBikeBikeIsStateOkQuestion" xml:space="preserve">
|
||||
<value>Fahrrad ist in Ordnung?</value>
|
||||
</data>
|
||||
|
|
@ -1026,7 +1020,7 @@ Außerdem:<br/>
|
|||
<data name="ChangeLog_3_0_365_MK_SB" xml:space="preserve">
|
||||
<value>Kleine Verbesserungen in Design und Performance.</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeTypeOfBikeText" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeTypeOfBikeText" xml:space="preserve">
|
||||
<value>Sie suchen ein </value>
|
||||
</data>
|
||||
<data name="MessageBikeTypeInfoText" xml:space="preserve">
|
||||
|
|
@ -1035,7 +1029,7 @@ Außerdem:<br/>
|
|||
<data name="MessageBikeTypeInfoTitle" xml:space="preserve">
|
||||
<value>Ausgewählter Fahrradtyp</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeButton" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeButton" xml:space="preserve">
|
||||
<value>Suchen</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_366_MK_SB" xml:space="preserve">
|
||||
|
|
@ -1329,4 +1323,7 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für
|
|||
<data name="QuestionBookBike" xml:space="preserve">
|
||||
<value>Rad {0} mieten?</value>
|
||||
</data>
|
||||
<data name="MarkingLegalInformation" xml:space="preserve">
|
||||
<value>Rechtliches</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -177,16 +177,13 @@ Rental can be ended if
|
|||
<data name="ErrorSupportmailPhoningFailed" xml:space="preserve">
|
||||
<value>Opening phone app failed. Make sure you have a phone app installed on your mobile device!</value>
|
||||
</data>
|
||||
<data name="MarkingAbout" xml:space="preserve">
|
||||
<value>Legal Information</value>
|
||||
</data>
|
||||
<data name="MarkingAccount" xml:space="preserve">
|
||||
<value>Account</value>
|
||||
</data>
|
||||
<data name="MarkingFeedbackAndContact" xml:space="preserve">
|
||||
<data name="MarkingContact" xml:space="preserve">
|
||||
<value>Contact</value>
|
||||
</data>
|
||||
<data name="MarkingFeesAndBikes" xml:space="preserve">
|
||||
<data name="MarkingHelp" xml:space="preserve">
|
||||
<value>Help</value>
|
||||
</data>
|
||||
<data name="MarkingLoggedInStateInfoLoggedIn" xml:space="preserve">
|
||||
|
|
@ -201,7 +198,7 @@ Rental can be ended if
|
|||
<data name="MarkingLogin" xml:space="preserve">
|
||||
<value>Login</value>
|
||||
</data>
|
||||
<data name="MarkingMapPage" xml:space="preserve">
|
||||
<data name="MarkingBikeLocations" xml:space="preserve">
|
||||
<value>Bike Locations</value>
|
||||
</data>
|
||||
<data name="MarkingMyBikes" xml:space="preserve">
|
||||
|
|
@ -210,10 +207,10 @@ Rental can be ended if
|
|||
<data name="MarkingSettings" xml:space="preserve">
|
||||
<value>Settings</value>
|
||||
</data>
|
||||
<data name="MarkingTabBikes" xml:space="preserve">
|
||||
<data name="MarkingTabManual" xml:space="preserve">
|
||||
<value>Manual</value>
|
||||
</data>
|
||||
<data name="MarkingTabFees" xml:space="preserve">
|
||||
<data name="MarkingTabTariffs" xml:space="preserve">
|
||||
<value>Tariffs</value>
|
||||
</data>
|
||||
<data name="MessageAnswerOk" xml:space="preserve">
|
||||
|
|
@ -644,13 +641,13 @@ Layout of bike names and id display improved.</value>
|
|||
<data name="ChangeLog_3_0_239" xml:space="preserve">
|
||||
<value>Bugfix: Bike description is displayed correctly again.</value>
|
||||
</data>
|
||||
<data name="MarkingFindBike" xml:space="preserve">
|
||||
<data name="MarkingSelectBike" xml:space="preserve">
|
||||
<value>Select Bike</value>
|
||||
</data>
|
||||
<data name="ActivityTextCheckBluetoothState" xml:space="preserve">
|
||||
<value>Checking state and permissions...</value>
|
||||
</data>
|
||||
<data name="ActivityTextFindBikeLoadingBikes" xml:space="preserve">
|
||||
<data name="ActivityTextSelectBikeLoadingBikes" xml:space="preserve">
|
||||
<value>Loading Bikes...</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_240" xml:space="preserve">
|
||||
|
|
@ -997,7 +994,7 @@ In addition: Small graphics let you see at a glance what type of bike it is.</va
|
|||
<data name="QuestionSupportmailAttachmentTitle" xml:space="preserve">
|
||||
<value>Consent</value>
|
||||
</data>
|
||||
<data name="PlaceholderFindBike" xml:space="preserve">
|
||||
<data name="PlaceholderSelectBike" xml:space="preserve">
|
||||
<value>Prefix and No., e.g. TR15</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_339_MK" xml:space="preserve">
|
||||
|
|
@ -1134,12 +1131,9 @@ Also:<br/>
|
|||
- Bug fixes<br/>
|
||||
- Package updates</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeLabel" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeLabel" xml:space="preserve">
|
||||
<value>Bike id</value>
|
||||
</data>
|
||||
<data name="MarkingSearchBike" xml:space="preserve">
|
||||
<value>Search bike</value>
|
||||
</data>
|
||||
<data name="QuestionRentalProcessCloseLockContinueRentalAnswer" xml:space="preserve">
|
||||
<value>Park bike</value>
|
||||
</data>
|
||||
|
|
@ -1155,7 +1149,7 @@ Also:<br/>
|
|||
<data name="ChangeLog_3_0_365_MK_SB" xml:space="preserve">
|
||||
<value>Minor design and performance improvements.</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeTypeOfBikeText" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeTypeOfBikeText" xml:space="preserve">
|
||||
<value>You search a </value>
|
||||
</data>
|
||||
<data name="MessageBikeTypeInfoText" xml:space="preserve">
|
||||
|
|
@ -1164,7 +1158,7 @@ Also:<br/>
|
|||
<data name="MessageBikeTypeInfoTitle" xml:space="preserve">
|
||||
<value>Selected bike type</value>
|
||||
</data>
|
||||
<data name="MarkingFindBikeButton" xml:space="preserve">
|
||||
<data name="MarkingSelectBikeButton" xml:space="preserve">
|
||||
<value>Search</value>
|
||||
</data>
|
||||
<data name="ChangeLog_3_0_366_MK_SB" xml:space="preserve">
|
||||
|
|
@ -1421,4 +1415,7 @@ The costs will be debited automatically within the next days. Ensure sufficient
|
|||
<data name="QuestionBookBike" xml:space="preserve">
|
||||
<value>Rent bike {0}?</value>
|
||||
</data>
|
||||
</root>
|
||||
<data name="MarkingLegalInformation" xml:space="preserve">
|
||||
<value>Legal information</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@
|
|||
<source>End rental</source>
|
||||
<target state="translated">Miete beenden</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingMapPage" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingBikeLocations" translate="yes" xml:space="preserve">
|
||||
<source>Bike Locations</source>
|
||||
<target state="final">Radstandorte</target>
|
||||
</trans-unit>
|
||||
|
|
@ -74,15 +74,11 @@
|
|||
<source>This version of the {0} App is outdated. Please update to the latest version.</source>
|
||||
<target state="final">Diese Version der {0} App ist veraltet. Bitte auf aktuelle Version aktualisieren.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingAbout" translate="yes" xml:space="preserve">
|
||||
<source>Legal Information</source>
|
||||
<target state="final">Rechtliches</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingAccount" translate="yes" xml:space="preserve">
|
||||
<source>Account</source>
|
||||
<target state="final">Konto</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFeedbackAndContact" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingContact" translate="yes" xml:space="preserve">
|
||||
<source>Contact</source>
|
||||
<target state="translated">Kontakt</target>
|
||||
</trans-unit>
|
||||
|
|
@ -94,7 +90,7 @@
|
|||
<source>My Bikes</source>
|
||||
<target state="final">Meine Räder</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFeesAndBikes" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingHelp" translate="yes" xml:space="preserve">
|
||||
<source>Help</source>
|
||||
<target state="translated">Hilfe</target>
|
||||
</trans-unit>
|
||||
|
|
@ -102,11 +98,11 @@
|
|||
<source>Settings</source>
|
||||
<target state="final">Einstellungen</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingTabBikes" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingTabManual" translate="yes" xml:space="preserve">
|
||||
<source>Manual</source>
|
||||
<target state="translated">Anleitung</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingTabFees" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingTabTariffs" translate="yes" xml:space="preserve">
|
||||
<source>Tariffs</source>
|
||||
<target state="translated">Tarife</target>
|
||||
</trans-unit>
|
||||
|
|
@ -687,7 +683,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
|
|||
<source>Bugfix: Bike description is displayed correctly again.</source>
|
||||
<target state="translated">Fehlerbehebung: Radname wird wieder korrekt angezeigt.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFindBike" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingSelectBike" translate="yes" xml:space="preserve">
|
||||
<source>Select Bike</source>
|
||||
<target state="translated">Rad auswählen</target>
|
||||
</trans-unit>
|
||||
|
|
@ -695,7 +691,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
|
|||
<source>Checking state and permissions...</source>
|
||||
<target state="translated">Prüfe Status und Berechtigungen...</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="ActivityTextFindBikeLoadingBikes" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="ActivityTextSelectBikeLoadingBikes" translate="yes" xml:space="preserve">
|
||||
<source>Loading Bikes...</source>
|
||||
<target state="translated">Lade Räder...</target>
|
||||
</trans-unit>
|
||||
|
|
@ -1175,7 +1171,7 @@ Außerdem: Kleine Grafiken lassen auf einen Blick erkennen um was für einen Rad
|
|||
<source>Consent</source>
|
||||
<target state="translated">Einwilligung</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="PlaceholderFindBike" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="PlaceholderSelectBike" translate="yes" xml:space="preserve">
|
||||
<source>Prefix and No., e.g. TR15</source>
|
||||
<target state="translated">Präfix und Nr., z.B. TR15</target>
|
||||
</trans-unit>
|
||||
|
|
@ -1391,14 +1387,10 @@ Außerdem:<br/>
|
|||
- Fehlerbehebungen<br/>
|
||||
- Paketaktualisierungen</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFindBikeLabel" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingSelectBikeLabel" translate="yes" xml:space="preserve">
|
||||
<source>Bike id</source>
|
||||
<target state="translated">Fahrrad-ID</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingSearchBike" translate="yes" xml:space="preserve">
|
||||
<source>Search bike</source>
|
||||
<target state="translated">Rad suchen</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingReturnBikeBikeIsStateOkQuestion" translate="yes" xml:space="preserve">
|
||||
<source>Is bike okay?</source>
|
||||
<target state="translated">Fahrrad ist in Ordnung?</target>
|
||||
|
|
@ -1415,7 +1407,7 @@ Außerdem:<br/>
|
|||
<source>Minor design and performance improvements.</source>
|
||||
<target state="translated">Kleine Verbesserungen in Design und Performance.</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFindBikeTypeOfBikeText" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingSelectBikeTypeOfBikeText" translate="yes" xml:space="preserve">
|
||||
<source>You search a </source>
|
||||
<target state="translated">Sie suchen ein </target>
|
||||
</trans-unit>
|
||||
|
|
@ -1427,7 +1419,7 @@ Außerdem:<br/>
|
|||
<source>Selected bike type</source>
|
||||
<target state="translated">Ausgewählter Fahrradtyp</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingFindBikeButton" translate="yes" xml:space="preserve">
|
||||
<trans-unit id="MarkingSelectBikeButton" translate="yes" xml:space="preserve">
|
||||
<source>Search</source>
|
||||
<target state="translated">Suchen</target>
|
||||
</trans-unit>
|
||||
|
|
@ -1837,6 +1829,10 @@ Die Kosten werden in den nächsten Tagen automatisch abgebucht. Sorgen Sie für
|
|||
<source>Rent bike {0}?</source>
|
||||
<target state="translated">Rad {0} mieten?</target>
|
||||
</trans-unit>
|
||||
<trans-unit id="MarkingLegalInformation" translate="yes" xml:space="preserve">
|
||||
<source>Legal information</source>
|
||||
<target state="translated">Rechtliches</target>
|
||||
</trans-unit>
|
||||
</group>
|
||||
</body>
|
||||
</file>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue