Version 3.0.299

This commit is contained in:
Oliver Hauff 2022-05-15 19:56:03 +02:00
parent c4357d3f7f
commit 310ea37085
35 changed files with 14350 additions and 14419 deletions

View file

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion> <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidStoreUncompressedFileExtensions /> <AndroidStoreUncompressedFileExtensions />
<MandroidI18n /> <MandroidI18n />
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize> <JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
@ -71,13 +71,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.3" /> <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" /> <PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache"> <PackageReference Include="MonkeyCache">
<Version>1.6.3</Version> <Version>1.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="MonkeyCache.FileStore"> <PackageReference Include="MonkeyCache.FileStore">
<Version>1.6.3</Version> <Version>1.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" /> <PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@ -144,7 +144,7 @@
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" /> <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="Validation" Version="2.5.51" /> <PackageReference Include="Validation" Version="2.5.42" />
<PackageReference Include="Xam.Plugin.Connectivity"> <PackageReference Include="Xam.Plugin.Connectivity">
<Version>3.2.0</Version> <Version>3.2.0</Version>
</PackageReference> </PackageReference>
@ -170,37 +170,37 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
<PackageReference Include="Xamarin.AndroidX.Core"> <PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.7.0.2</Version> <Version>1.6.0.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter"> <PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.2.6.1</Version> <Version>1.2.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette"> <PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.13</Version> <Version>1.0.0.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView"> <PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.2.1.6</Version> <Version>1.2.1.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" /> <PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.0" /> <PackageReference Include="Xamarin.Build.Download" Version="0.10.0" />
<PackageReference Include="Xamarin.CommunityToolkit"> <PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.1</Version> <Version>1.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.7.2</Version> <Version>1.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2196" />
<PackageReference Include="Xamarin.Forms.AppLinks"> <PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2401</Version> <Version>5.0.0.2244</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps"> <PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>3.3.0</Version> <Version>3.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" /> <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.6" /> <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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.297" android:versionCode="297"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.299" android:versionCode="299">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- Permission to receive remote notifications from Google Play Services -->
<!-- Notice here that we have the package name of our application as a prefix on the permissions. --> <!-- Notice here that we have the package name of our application as a prefix on the permissions. -->

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View file

@ -53,8 +53,8 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>LastenradBayern</string> <string>LastenradBayern</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>297</string> <string>299</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.297</string> <string>3.0.299</string>
</dict> </dict>
</plist> </plist>

View file

@ -67,8 +67,6 @@
<DependentUpon>RootPageFlyout.xaml</DependentUpon> <DependentUpon>RootPageFlyout.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" /> <Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\AnyPermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\PermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
<DependentUpon>AppShell.xaml</DependentUpon> <DependentUpon>AppShell.xaml</DependentUpon>
</Compile> </Compile>

View file

@ -1,30 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ContentView xmlns="http://xamarin.com/schemas/2014/forms" <ContentView xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
BackgroundColor="{DynamicResource Key=primary-back-title-color}" BackgroundColor="#009bda"
x:Class="TINK.View.RootShell.FlyoutHeader"> x:Class="TINK.View.RootShell.FlyoutHeader">
<Grid Padding="5,10">
<Grid Padding="0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="200" />
<RowDefinition Height="30" />
<RowDefinition Height="30" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="363" />
</Grid.ColumnDefinitions>
<Image <Image
HeightRequest="140"
Grid.RowSpan="2"
Aspect="AspectFit" Aspect="AspectFit"
Source="sharee_no_background.png"/> Source="sharee_no_background.png"/>
<Label
HorizontalOptions="CenterAndExpand"
FontSize="Large"
FontAttributes="Bold"
Grid.Row="1"
Text="{Binding MasterDetailMenuTitlte}"/>
<Label
HorizontalOptions="CenterAndExpand"
FontSize="Micro"
HorizontalTextAlignment="Center"
Grid.Row="2"
Text="gefördert vom Bayerischen Staatministerium für Wohnen, Bau und Verkehr"/>
</Grid> </Grid>
</ContentView> </ContentView>

View file

@ -2,19 +2,22 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.View.Settings.SettingsPage" x:Class="TINK.View.Settings.SettingsPage"
xmlns:conv="clr-namespace:TINK.View.Settings"> xmlns:conv="clr-namespace:TINK.View.Settings;assembly=TINKLib"
xmlns:account="clr-namespace:TINK.Model.User.Account;assembly=TINKLib"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib">
<ContentPage.Resources> <ContentPage.Resources>
<conv:AnyPermissionToVisibleConverter x:Key="Frame_Converter"/> <conv:BackendPermissionsToVisibleConverter x:Key="Frame_Converter"/>
<conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="PickCopriServer"/> <conv:PermissionToVisibleConverter x:Key="SwitchTheme_Converter" VisibleFlag="{x:Static account:Permissions.SwitchTheme}"/>
<conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="ManagePolling"/> <conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="{x:Static account:Permissions.PickCopriServer}"/>
<conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="ManageCopriCacheExpiration"/> <conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="{x:Static account:Permissions.ManagePolling}"/>
<conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="PickLockServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="{x:Static account:Permissions.ManageCopriCacheExpiration}"/>
<conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="PickLocationServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLockServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="PickLoggingLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLocationServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="ReportLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="{x:Static account:Permissions.PickLoggingLevel}"/>
<conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="ShowDiagnostics"/> <conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="{x:Static account:Permissions.ReportLevel}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="SwitchNoSiteCaching"/> <conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="{x:Static account:Permissions.ShowDiagnostics}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="{x:Static account:Permissions.SwitchNoSiteCaching}"/>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
@ -26,14 +29,14 @@
--> -->
<Frame> <Frame>
<StackLayout> <StackLayout>
<Label Text="Karte auf aktuelle Position ausrichten"/> <Label Text="{x:Static resources:AppResources.MarkingCenterMapToCurrentPos}"/>
<Switch IsToggled="{Binding CenterMapToCurrentLocation}"/> <Switch IsToggled="{Binding CenterMapToCurrentLocation}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<!-- Filter on view TINK/ Konrad --> <!-- Filter on view TINK/ Konrad -->
<Frame IsVisible="{Binding IsGroupFilterVisible}"> <Frame IsVisible="{Binding IsGroupFilterVisible}">
<StackLayout> <StackLayout>
<Label Text="Ausblenden/ Einblenden"/> <Label Text="{x:Static resources:AppResources.MarkingShowHideBikesOfType}"/>
<ListView <ListView
HasUnevenRows="True" HasUnevenRows="True"
HeightRequest="120" HeightRequest="120"
@ -52,14 +55,14 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
<StackLayout> <StackLayout>
<!-- Themes --> <!-- Themes -->
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
Text="Theme"/> Text="Theme"/>
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
ItemsSource="{Binding Themes.ServicesTextList}" ItemsSource="{Binding Themes.ServicesTextList}"
SelectedItem="{Binding Themes.ActiveText}"/> SelectedItem="{Binding Themes.ActiveText}"/>
</StackLayout> </StackLayout>
@ -107,12 +110,12 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}">
<!-- Lock control --> <!-- Lock control -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
Text="Lock Control" /> Text="{x:Static resources:AppResources.MarkingLockControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
ItemsSource="{Binding LocksServices.Services.ServicesTextList}" ItemsSource="{Binding LocksServices.Services.ServicesTextList}"
@ -132,13 +135,13 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}">
<!-- Geolocation --> <!-- Geolocation -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
Text="Geolocation Control" /> Text="{x:Static resources:AppResources.MarkingGeolocationControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
ItemsSource="{Binding GeolocationServices.ServicesTextList}" ItemsSource="{Binding GeolocationServices.ServicesTextList}"
@ -146,24 +149,24 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}">
<!-- Web site caching --> <!-- Web site caching -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
Text="Caching von Websiten."/> Text="{x:Static resources:AppResources.MarkingWebsiteCaching}"/>
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
IsToggled="{Binding IsSiteCachingOnDisplayValue}"/> IsToggled="{Binding IsSiteCachingOnDisplayValue}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
Text="Logging level" /> Text="{x:Static resources:AppResources.MarkingLoggingLevel}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
ItemsSource="{Binding LoggingLevels}" ItemsSource="{Binding LoggingLevels}"
@ -178,19 +181,19 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
Text="Verbose error messages" /> Text="{x:Static resources:AppResources.MarkingVerboseErrorMessage}" />
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
IsToggled="{Binding IsReportLevelVerbose}"/> IsToggled="{Binding IsReportLevelVerbose}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ShowDiagnostics_Converter}}">
<!-- Display of parameters --> <!-- Display of parameters -->
<StackLayout> <StackLayout>
<Label <Label

View file

@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v12.0</TargetFrameworkVersion> <TargetFrameworkVersion>v11.0</TargetFrameworkVersion>
<AndroidStoreUncompressedFileExtensions /> <AndroidStoreUncompressedFileExtensions />
<MandroidI18n /> <MandroidI18n />
<JavaMaximumHeapSize>2G</JavaMaximumHeapSize> <JavaMaximumHeapSize>2G</JavaMaximumHeapSize>
@ -71,13 +71,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.3" /> <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" /> <PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache"> <PackageReference Include="MonkeyCache">
<Version>1.6.3</Version> <Version>1.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="MonkeyCache.FileStore"> <PackageReference Include="MonkeyCache.FileStore">
<Version>1.6.3</Version> <Version>1.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NETStandard.Library" Version="2.0.3" /> <PackageReference Include="NETStandard.Library" Version="2.0.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@ -144,7 +144,7 @@
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" /> <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="Validation" Version="2.5.51" /> <PackageReference Include="Validation" Version="2.5.42" />
<PackageReference Include="Xam.Plugin.Connectivity"> <PackageReference Include="Xam.Plugin.Connectivity">
<Version>3.2.0</Version> <Version>3.2.0</Version>
</PackageReference> </PackageReference>
@ -170,37 +170,37 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
<PackageReference Include="Xamarin.AndroidX.Core"> <PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.7.0.2</Version> <Version>1.6.0.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter"> <PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.2.6.1</Version> <Version>1.2.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette"> <PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.13</Version> <Version>1.0.0.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView"> <PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.2.1.6</Version> <Version>1.2.1.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" /> <PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.0" /> <PackageReference Include="Xamarin.Build.Download" Version="0.10.0" />
<PackageReference Include="Xamarin.CommunityToolkit"> <PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.1</Version> <Version>1.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.7.2</Version> <Version>1.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2196" />
<PackageReference Include="Xamarin.Forms.AppLinks"> <PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2401</Version> <Version>5.0.0.2244</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps"> <PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>3.3.0</Version> <Version>3.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" /> <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.6" /> <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?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.297" android:versionCode="297"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.299" android:versionCode="299">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- Permission to receive remote notifications from Google Play Services -->
<!-- Notice here that we have the package name of our application as a prefix on the permissions. --> <!-- Notice here that we have the package name of our application as a prefix on the permissions. -->

File diff suppressed because it is too large Load diff

View file

@ -53,8 +53,8 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>Mein konrad</string> <string>Mein konrad</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>297</string> <string>299</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.297</string> <string>3.0.299</string>
</dict> </dict>
</plist> </plist>

View file

@ -188,6 +188,7 @@ arendiCentral:
: (Page)new View.Root.RootPage(); // Just start sharee- app : (Page)new View.Root.RootPage(); // Just start sharee- app
#else #else
// Use shell. // Use shell.
//MainPage = new TINK.View.Welcome.WelcomePage();
MainPage = ModelRoot.WhatsNew.IsShowRequired MainPage = ModelRoot.WhatsNew.IsShowRequired
? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info. ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
: (Page)new View.RootShell.AppShell(); // Just start sharee- app : (Page)new View.RootShell.AppShell(); // Just start sharee- app

View file

@ -71,8 +71,6 @@
<DependentUpon>RootPageFlyout.xaml</DependentUpon> <DependentUpon>RootPageFlyout.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" /> <Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\AnyPermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\PermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
<DependentUpon>AppShell.xaml</DependentUpon> <DependentUpon>AppShell.xaml</DependentUpon>
</Compile> </Compile>

View file

@ -2,19 +2,22 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.View.Settings.SettingsPage" x:Class="TINK.View.Settings.SettingsPage"
xmlns:conv="clr-namespace:TINK.View.Settings"> xmlns:conv="clr-namespace:TINK.View.Settings;assembly=TINKLib"
xmlns:account="clr-namespace:TINK.Model.User.Account;assembly=TINKLib"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib">
<ContentPage.Resources> <ContentPage.Resources>
<conv:AnyPermissionToVisibleConverter x:Key="Frame_Converter"/> <conv:BackendPermissionsToVisibleConverter x:Key="Frame_Converter"/>
<conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="PickCopriServer"/> <conv:PermissionToVisibleConverter x:Key="SwitchTheme_Converter" VisibleFlag="{x:Static account:Permissions.SwitchTheme}"/>
<conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="ManagePolling"/> <conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="{x:Static account:Permissions.PickCopriServer}"/>
<conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="ManageCopriCacheExpiration"/> <conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="{x:Static account:Permissions.ManagePolling}"/>
<conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="PickLockServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="{x:Static account:Permissions.ManageCopriCacheExpiration}"/>
<conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="PickLocationServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLockServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="PickLoggingLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLocationServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="ReportLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="{x:Static account:Permissions.PickLoggingLevel}"/>
<conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="ShowDiagnostics"/> <conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="{x:Static account:Permissions.ReportLevel}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="SwitchNoSiteCaching"/> <conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="{x:Static account:Permissions.ShowDiagnostics}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="{x:Static account:Permissions.SwitchNoSiteCaching}"/>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
@ -26,14 +29,14 @@
--> -->
<Frame> <Frame>
<StackLayout> <StackLayout>
<Label Text="Karte auf aktuelle Position ausrichten"/> <Label Text="{x:Static resources:AppResources.MarkingCenterMapToCurrentPos}"/>
<Switch IsToggled="{Binding CenterMapToCurrentLocation}"/> <Switch IsToggled="{Binding CenterMapToCurrentLocation}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<!-- Filter on view TINK/ Konrad --> <!-- Filter on view TINK/ Konrad -->
<Frame IsVisible="{Binding IsGroupFilterVisible}"> <Frame IsVisible="{Binding IsGroupFilterVisible}">
<StackLayout> <StackLayout>
<Label Text="Ausblenden/ Einblenden"/> <Label Text="{x:Static resources:AppResources.MarkingShowHideBikesOfType}"/>
<ListView <ListView
HasUnevenRows="True" HasUnevenRows="True"
HeightRequest="120" HeightRequest="120"
@ -52,14 +55,14 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
<StackLayout> <StackLayout>
<!-- Themes --> <!-- Themes -->
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
Text="Theme"/> Text="Theme"/>
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
ItemsSource="{Binding Themes.ServicesTextList}" ItemsSource="{Binding Themes.ServicesTextList}"
SelectedItem="{Binding Themes.ActiveText}"/> SelectedItem="{Binding Themes.ActiveText}"/>
</StackLayout> </StackLayout>
@ -107,12 +110,12 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}">
<!-- Lock control --> <!-- Lock control -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
Text="Lock Control" /> Text="{x:Static resources:AppResources.MarkingLockControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
ItemsSource="{Binding LocksServices.Services.ServicesTextList}" ItemsSource="{Binding LocksServices.Services.ServicesTextList}"
@ -132,13 +135,13 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}">
<!-- Geolocation --> <!-- Geolocation -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
Text="Geolocation Control" /> Text="{x:Static resources:AppResources.MarkingGeolocationControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
ItemsSource="{Binding GeolocationServices.ServicesTextList}" ItemsSource="{Binding GeolocationServices.ServicesTextList}"
@ -146,24 +149,24 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}">
<!-- Web site caching --> <!-- Web site caching -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
Text="Caching von Websiten."/> Text="{x:Static resources:AppResources.MarkingWebsiteCaching}"/>
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
IsToggled="{Binding IsSiteCachingOnDisplayValue}"/> IsToggled="{Binding IsSiteCachingOnDisplayValue}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
Text="Logging level" /> Text="{x:Static resources:AppResources.MarkingLoggingLevel}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
ItemsSource="{Binding LoggingLevels}" ItemsSource="{Binding LoggingLevels}"
@ -178,19 +181,19 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
Text="Verbose error messages" /> Text="{x:Static resources:AppResources.MarkingVerboseErrorMessage}" />
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
IsToggled="{Binding IsReportLevelVerbose}"/> IsToggled="{Binding IsReportLevelVerbose}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ShowDiagnostics_Converter}}">
<!-- Display of parameters --> <!-- Display of parameters -->
<StackLayout> <StackLayout>
<Label <Label

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" package="com.hauffware.sharee" android:versionName="3.0.297" android:versionCode="297"> <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" package="com.hauffware.sharee" android:versionName="3.0.299" android:versionCode="299">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" /> <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
<!-- Google Maps related permissions --> <!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services --> <!-- Permission to receive remote notifications from Google Play Services -->
<!-- Notice here that we have the package name of our application as a prefix on the permissions. --> <!-- Notice here that we have the package name of our application as a prefix on the permissions. -->

File diff suppressed because it is too large Load diff

View file

@ -65,7 +65,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.NETCore.Platforms" Version="6.0.3" /> <PackageReference Include="Microsoft.NETCore.Platforms" Version="5.0.4" />
<PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" /> <PackageReference Include="Microsoft.Win32.Primitives" Version="4.3.0" />
<PackageReference Include="MonkeyCache"> <PackageReference Include="MonkeyCache">
<Version>1.6.3</Version> <Version>1.6.3</Version>
@ -138,7 +138,7 @@
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" /> <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
<PackageReference Include="System.Xml.XDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" /> <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="Validation" Version="2.5.51" /> <PackageReference Include="Validation" Version="2.5.42" />
<PackageReference Include="Xam.Plugin.Connectivity"> <PackageReference Include="Xam.Plugin.Connectivity">
<Version>3.2.0</Version> <Version>3.2.0</Version>
</PackageReference> </PackageReference>
@ -164,37 +164,37 @@
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" /> <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.0.0.3" />
<PackageReference Include="Xamarin.AndroidX.Core"> <PackageReference Include="Xamarin.AndroidX.Core">
<Version>1.7.0.2</Version> <Version>1.6.0.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.MediaRouter"> <PackageReference Include="Xamarin.AndroidX.MediaRouter">
<Version>1.2.6.1</Version> <Version>1.2.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.Palette"> <PackageReference Include="Xamarin.AndroidX.Palette">
<Version>1.0.0.13</Version> <Version>1.0.0.10</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.AndroidX.RecyclerView"> <PackageReference Include="Xamarin.AndroidX.RecyclerView">
<Version>1.2.1.6</Version> <Version>1.2.1.3</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Auth" Version="1.7.0" /> <PackageReference Include="Xamarin.Auth" Version="1.7.0" />
<PackageReference Include="Xamarin.Build.Download" Version="0.11.0" /> <PackageReference Include="Xamarin.Build.Download" Version="0.11.0" />
<PackageReference Include="Xamarin.CommunityToolkit"> <PackageReference Include="Xamarin.CommunityToolkit">
<Version>2.0.1</Version> <Version>1.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Essentials"> <PackageReference Include="Xamarin.Essentials">
<Version>1.7.2</Version> <Version>1.7.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms" Version="5.0.0.2401" /> <PackageReference Include="Xamarin.Forms" Version="5.0.0.2196" />
<PackageReference Include="Xamarin.Forms.AppLinks"> <PackageReference Include="Xamarin.Forms.AppLinks">
<Version>5.0.0.2401</Version> <Version>5.0.0.2244</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps"> <PackageReference Include="Xamarin.Forms.GoogleMaps">
<Version>3.3.0</Version> <Version>3.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" /> <PackageReference Include="Xamarin.Forms.GoogleMaps.Bindings" Version="3.0.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="117.6.0.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.6" /> <PackageReference Include="Xamarin.GooglePlayServices.Basement" Version="117.6.0.2" />
<PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="117.0.1.1" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.5" /> <PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />

View file

@ -53,8 +53,8 @@
<key>CFBundleDisplayName</key> <key>CFBundleDisplayName</key>
<string>sharee.bike</string> <string>sharee.bike</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>297</string> <string>299</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>3.0.297</string> <string>3.0.299</string>
</dict> </dict>
</plist> </plist>

View file

@ -67,8 +67,6 @@
<DependentUpon>RootPageFlyout.xaml</DependentUpon> <DependentUpon>RootPageFlyout.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" /> <Compile Include="$(MSBuildThisFileDirectory)View\RootFlyout\RootPageFlyoutMenuItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\AnyPermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\Settings\PermissionToVisibleConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs"> <Compile Include="$(MSBuildThisFileDirectory)View\RootShell\AppShell.xaml.cs">
<DependentUpon>AppShell.xaml</DependentUpon> <DependentUpon>AppShell.xaml</DependentUpon>
</Compile> </Compile>

View file

@ -2,19 +2,22 @@
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.View.Settings.SettingsPage" x:Class="TINK.View.Settings.SettingsPage"
xmlns:conv="clr-namespace:TINK.View.Settings"> xmlns:conv="clr-namespace:TINK.View.Settings;assembly=TINKLib"
xmlns:account="clr-namespace:TINK.Model.User.Account;assembly=TINKLib"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib">
<ContentPage.Resources> <ContentPage.Resources>
<conv:AnyPermissionToVisibleConverter x:Key="Frame_Converter"/> <conv:BackendPermissionsToVisibleConverter x:Key="Frame_Converter"/>
<conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="PickCopriServer"/> <conv:PermissionToVisibleConverter x:Key="SwitchTheme_Converter" VisibleFlag="{x:Static account:Permissions.SwitchTheme}"/>
<conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="ManagePolling"/> <conv:PermissionToVisibleConverter x:Key="PickCopriServer_Converter" VisibleFlag="{x:Static account:Permissions.PickCopriServer}"/>
<conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="ManageCopriCacheExpiration"/> <conv:PermissionToVisibleConverter x:Key="ManagePolling_Converter" VisibleFlag="{x:Static account:Permissions.ManagePolling}"/>
<conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="PickLockServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="ManageCopriCacheExpiration_Converter" VisibleFlag="{x:Static account:Permissions.ManageCopriCacheExpiration}"/>
<conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="PickLocationServiceImplementation"/> <conv:PermissionToVisibleConverter x:Key="PickLockServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLockServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="PickLoggingLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLocationServiceImplementation_Converter" VisibleFlag="{x:Static account:Permissions.PickLocationServiceImplementation}"/>
<conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="ReportLevel"/> <conv:PermissionToVisibleConverter x:Key="PickLoggingLevel_Converter" VisibleFlag="{x:Static account:Permissions.PickLoggingLevel}"/>
<conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="ShowDiagnostics"/> <conv:PermissionToVisibleConverter x:Key="ReportLevel_Converter" VisibleFlag="{x:Static account:Permissions.ReportLevel}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="SwitchNoSiteCaching"/> <conv:PermissionToVisibleConverter x:Key="ShowDiagnostics_Converter" VisibleFlag="{x:Static account:Permissions.ShowDiagnostics}"/>
<conv:PermissionToVisibleConverter x:Key="SwitchSiteCaching_Converter" VisibleFlag="{x:Static account:Permissions.SwitchNoSiteCaching}"/>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.Content> <ContentPage.Content>
@ -26,14 +29,14 @@
--> -->
<Frame> <Frame>
<StackLayout> <StackLayout>
<Label Text="Karte auf aktuelle Position ausrichten"/> <Label Text="{x:Static resources:AppResources.MarkingCenterMapToCurrentPos}"/>
<Switch IsToggled="{Binding CenterMapToCurrentLocation}"/> <Switch IsToggled="{Binding CenterMapToCurrentLocation}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<!-- Filter on view TINK/ Konrad --> <!-- Filter on view TINK/ Konrad -->
<Frame IsVisible="{Binding IsGroupFilterVisible}"> <Frame IsVisible="{Binding IsGroupFilterVisible}">
<StackLayout> <StackLayout>
<Label Text="Ausblenden/ Einblenden"/> <Label Text="{x:Static resources:AppResources.MarkingShowHideBikesOfType}"/>
<ListView <ListView
HasUnevenRows="True" HasUnevenRows="True"
HeightRequest="120" HeightRequest="120"
@ -52,14 +55,14 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
<StackLayout> <StackLayout>
<!-- Themes --> <!-- Themes -->
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
Text="Theme"/> Text="Theme"/>
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
ItemsSource="{Binding Themes.ServicesTextList}" ItemsSource="{Binding Themes.ServicesTextList}"
SelectedItem="{Binding Themes.ActiveText}"/> SelectedItem="{Binding Themes.ActiveText}"/>
</StackLayout> </StackLayout>
@ -107,12 +110,12 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}">
<!-- Lock control --> <!-- Lock control -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
Text="Lock Control" /> Text="{x:Static resources:AppResources.MarkingLockControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLockServiceImplementation_Converter}}"
ItemsSource="{Binding LocksServices.Services.ServicesTextList}" ItemsSource="{Binding LocksServices.Services.ServicesTextList}"
@ -132,13 +135,13 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}">
<!-- Geolocation --> <!-- Geolocation -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
Text="Geolocation Control" /> Text="{x:Static resources:AppResources.MarkingGeolocationControl}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLocationServiceImplementation_Converter}}"
ItemsSource="{Binding GeolocationServices.ServicesTextList}" ItemsSource="{Binding GeolocationServices.ServicesTextList}"
@ -146,24 +149,24 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}">
<!-- Web site caching --> <!-- Web site caching -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
Text="Caching von Websiten."/> Text="{x:Static resources:AppResources.MarkingWebsiteCaching}"/>
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchSiteCaching_Converter}}"
IsToggled="{Binding IsSiteCachingOnDisplayValue}"/> IsToggled="{Binding IsSiteCachingOnDisplayValue}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
Text="Logging level" /> Text="{x:Static resources:AppResources.MarkingLoggingLevel}" />
<Picker <Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource PickLoggingLevel_Converter}}"
ItemsSource="{Binding LoggingLevels}" ItemsSource="{Binding LoggingLevels}"
@ -178,19 +181,19 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}">
<!-- Logging --> <!-- Logging -->
<StackLayout> <StackLayout>
<Label <Label
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
Text="Verbose error messages" /> Text="{x:Static resources:AppResources.MarkingVerboseErrorMessage}" />
<Switch <Switch
IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}" IsVisible="{Binding DebugLevel, Converter={StaticResource ReportLevel_Converter}}"
IsToggled="{Binding IsReportLevelVerbose}"/> IsToggled="{Binding IsReportLevelVerbose}"/>
</StackLayout> </StackLayout>
</Frame> </Frame>
<Frame <Frame
IsVisible="{Binding DebugLevel, Converter={StaticResource Frame_Converter}}"> IsVisible="{Binding DebugLevel, Converter={StaticResource ShowDiagnostics_Converter}}">
<!-- Display of parameters --> <!-- Display of parameters -->
<StackLayout> <StackLayout>
<Label <Label

View file

@ -18,6 +18,7 @@ namespace TINK.Model.User.Account
ShowDiagnostics = 128, // Turns on display of diagnostics. ShowDiagnostics = 128, // Turns on display of diagnostics.
SwitchNoSiteCaching = 1024, // Allows to turn off/ on caching of sites displayed in app hosted by COPRI SwitchNoSiteCaching = 1024, // Allows to turn off/ on caching of sites displayed in app hosted by COPRI
ReportLevel = 2048, // Allows extent to show error messages. ReportLevel = 2048, // Allows extent to show error messages.
SwitchTheme = 4096, // Allows user to switch theme (sharee.bike, Meinkonrad, Lastenrad Bayern)
All = PickCopriServer + All = PickCopriServer +
ManageCopriCacheExpiration + ManageCopriCacheExpiration +
ManagePolling + ManagePolling +
@ -26,7 +27,8 @@ namespace TINK.Model.User.Account
PickLoggingLevel + PickLoggingLevel +
ShowDiagnostics + ShowDiagnostics +
SwitchNoSiteCaching + SwitchNoSiteCaching +
ReportLevel, ReportLevel +
SwitchTheme,
} }
/// <summary> /// <summary>

View file

@ -518,6 +518,14 @@ namespace TINK.Model
{ {
new Version(3, 0, 297), new Version(3, 0, 297),
AppResources.ChangeLog3_0_293 AppResources.ChangeLog3_0_293
},
{
new Version(3, 0, 298),
AppResources.ChangeLog3_0_298
},
{
new Version(3, 0, 299),
AppResources.ChangeLog3_0_299
} }
}; };

View file

@ -1045,6 +1045,24 @@ namespace TINK.MultilingualResources {
} }
} }
/// <summary>
/// Looks up a localized string similar to New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App..
/// </summary>
public static string ChangeLog3_0_298 {
get {
return ResourceManager.GetString("ChangeLog3_0_298", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Bugfix: Bluetooth lock control works again on Android 12..
/// </summary>
public static string ChangeLog3_0_299 {
get {
return ResourceManager.GetString("ChangeLog3_0_299", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Lock of rented bike cannot be be connected right now.. /// Looks up a localized string similar to Lock of rented bike cannot be be connected right now..
/// </summary> /// </summary>
@ -1550,6 +1568,15 @@ namespace TINK.MultilingualResources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Center map to current position.
/// </summary>
public static string MarkingCenterMapToCurrentPos {
get {
return ResourceManager.GetString("MarkingCenterMapToCurrentPos", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to City bike. /// Looks up a localized string similar to City bike.
/// </summary> /// </summary>
@ -1613,6 +1640,24 @@ namespace TINK.MultilingualResources {
} }
} }
/// <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 Lock control.
/// </summary>
public static string MarkingLockControl {
get {
return ResourceManager.GetString("MarkingLockControl", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Logged in as {0}.. /// Looks up a localized string similar to Logged in as {0}..
/// </summary> /// </summary>
@ -1640,6 +1685,15 @@ namespace TINK.MultilingualResources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Logging level.
/// </summary>
public static string MarkingLoggingLevel {
get {
return ResourceManager.GetString("MarkingLoggingLevel", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Login. /// Looks up a localized string similar to Login.
/// </summary> /// </summary>
@ -1758,6 +1812,15 @@ namespace TINK.MultilingualResources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Show/ hide.
/// </summary>
public static string MarkingShowHideBikesOfType {
get {
return ResourceManager.GetString("MarkingShowHideBikesOfType", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Instructions. /// Looks up a localized string similar to Instructions.
/// </summary> /// </summary>
@ -1776,6 +1839,24 @@ namespace TINK.MultilingualResources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Verbose error messages.
/// </summary>
public static string MarkingVerboseErrorMessage {
get {
return ResourceManager.GetString("MarkingVerboseErrorMessage", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Website caching.
/// </summary>
public static string MarkingWebsiteCaching {
get {
return ResourceManager.GetString("MarkingWebsiteCaching", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Log out. /// Looks up a localized string similar to Log out.
/// </summary> /// </summary>

View file

@ -876,4 +876,31 @@ Entwurf Unterstützung eines neuen Schlosstyps hinzugefügt.
Kleinere Fehlerbehebungen. Kleinere Fehlerbehebungen.
</value> </value>
</data> </data>
<data name="MarkingCenterMapToCurrentPos" xml:space="preserve">
<value>Karte auf aktuelle Position ausrichten</value>
</data>
<data name="MarkingGeolocationControl" xml:space="preserve">
<value>Standort Steuerung</value>
</data>
<data name="MarkingLockControl" xml:space="preserve">
<value>Schloss Steuerung</value>
</data>
<data name="MarkingLoggingLevel" xml:space="preserve">
<value>Protokollierungsstufe</value>
</data>
<data name="MarkingShowHideBikesOfType" xml:space="preserve">
<value>Ausblenden/ Einblenden</value>
</data>
<data name="MarkingVerboseErrorMessage" xml:space="preserve">
<value>Ausführliche Fehlermeldungen</value>
</data>
<data name="MarkingWebsiteCaching" xml:space="preserve">
<value>Zwischenspeicherung von Websiten</value>
</data>
<data name="ChangeLog3_0_298" xml:space="preserve">
<value>Neue Wort-Bild-Marke in das Menü der Lastenrad Bayern App integriert.</value>
</data>
<data name="ChangeLog3_0_299" xml:space="preserve">
<value>Fehlerbehebung: Bluetooth-Schlossanstereuerung funktioniert wieder unter Android 12.</value>
</data>
</root> </root>

View file

@ -968,4 +968,31 @@ NuGet packages updated.
Started adding support for new lock type. Started adding support for new lock type.
Minor bugfixes.</value> Minor bugfixes.</value>
</data> </data>
<data name="MarkingCenterMapToCurrentPos" xml:space="preserve">
<value>Center map to current position</value>
</data>
<data name="MarkingGeolocationControl" xml:space="preserve">
<value>Geolocation Control</value>
</data>
<data name="MarkingLockControl" xml:space="preserve">
<value>Lock control</value>
</data>
<data name="MarkingLoggingLevel" xml:space="preserve">
<value>Logging level</value>
</data>
<data name="MarkingShowHideBikesOfType" xml:space="preserve">
<value>Show/ hide</value>
</data>
<data name="MarkingVerboseErrorMessage" xml:space="preserve">
<value>Verbose error messages</value>
</data>
<data name="MarkingWebsiteCaching" xml:space="preserve">
<value>Website caching</value>
</data>
<data name="ChangeLog3_0_298" xml:space="preserve">
<value>New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App.</value>
</data>
<data name="ChangeLog3_0_299" xml:space="preserve">
<value>Bugfix: Bluetooth lock control works again on Android 12.</value>
</data>
</root> </root>

View file

@ -1193,6 +1193,42 @@ Entwurf Unterstützung eines neuen Schlosstyps hinzugefügt.
Kleinere Fehlerbehebungen. Kleinere Fehlerbehebungen.
</target> </target>
</trans-unit> </trans-unit>
<trans-unit id="MarkingCenterMapToCurrentPos" translate="yes" xml:space="preserve">
<source>Center map to current position</source>
<target state="translated">Karte auf aktuelle Position ausrichten</target>
</trans-unit>
<trans-unit id="MarkingGeolocationControl" translate="yes" xml:space="preserve">
<source>Geolocation Control</source>
<target state="translated">Standort Steuerung</target>
</trans-unit>
<trans-unit id="MarkingLockControl" translate="yes" xml:space="preserve">
<source>Lock control</source>
<target state="translated">Schloss Steuerung</target>
</trans-unit>
<trans-unit id="MarkingLoggingLevel" translate="yes" xml:space="preserve">
<source>Logging level</source>
<target state="translated">Protokollierungsstufe</target>
</trans-unit>
<trans-unit id="MarkingShowHideBikesOfType" translate="yes" xml:space="preserve">
<source>Show/ hide</source>
<target state="translated">Ausblenden/ Einblenden</target>
</trans-unit>
<trans-unit id="MarkingVerboseErrorMessage" translate="yes" xml:space="preserve">
<source>Verbose error messages</source>
<target state="translated">Ausführliche Fehlermeldungen</target>
</trans-unit>
<trans-unit id="MarkingWebsiteCaching" translate="yes" xml:space="preserve">
<source>Website caching</source>
<target state="translated">Zwischenspeicherung von Websiten</target>
</trans-unit>
<trans-unit id="ChangeLog3_0_298" translate="yes" xml:space="preserve">
<source>New Wort-Bild-Marke integrated in flyout menu for Lastenrad Bayern App.</source>
<target state="translated">Neue Wort-Bild-Marke in das Menü der Lastenrad Bayern App integriert.</target>
</trans-unit>
<trans-unit id="ChangeLog3_0_299" translate="yes" xml:space="preserve">
<source>Bugfix: Bluetooth lock control works again on Android 12.</source>
<target state="translated">Fehlerbehebung: Bluetooth-Schlossanstereuerung funktioniert wieder unter Android 12.</target>
</trans-unit>
</group> </group>
</body> </body>
</file> </file>

View file

@ -1,11 +1,7 @@
using System; using System;
using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Text;
using Xamarin.Forms; using Xamarin.Forms;
using TINK.Model.User.Account; using TINK.Model.User.Account;
using System.Linq;
using System.Reflection;
namespace TINK.View.Settings namespace TINK.View.Settings
{ {
@ -15,14 +11,15 @@ namespace TINK.View.Settings
/// Used for container which holds a bunch of GUI elemets which migth all/ partly/ none be visible /// Used for container which holds a bunch of GUI elemets which migth all/ partly/ none be visible
/// If all childs are invisible frame must be invisible as well. As soon as one child is visible frame must be visible as well. /// If all childs are invisible frame must be invisible as well. As soon as one child is visible frame must be visible as well.
/// </summary> /// </summary>
public class AnyPermissionToVisibleConverter : IValueConverter public class BackendPermissionsToVisibleConverter : IValueConverter
{ {
/// <summary> Converts permission value into visible state.</summary> /// <summary> Converts permission value into visible state.</summary>
/// <param name="value">Permission value from view model used to derive whether object is visible or not.</param> /// <param name="value">Permission value from view model used to derive whether object is visible or not.</param>
/// <returns>Boolean value indicating whether object is visible or not.</returns> /// <returns>Boolean value indicating whether object is visible or not.</returns>
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{ {
return ((Permissions)(value)) != Permissions.None; var enumValue = (Permissions)value;
return enumValue.HasFlag(Permissions.PickCopriServer) | enumValue.HasFlag(Permissions.ManagePolling) | enumValue.HasFlag(Permissions.ManageCopriCacheExpiration);
} }
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)