roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-04-24 21:56:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

3.0.275

Browse source
This commit is contained in:
Oliver Hauff 2022-01-22 18:28:01 +01:00
parent f38b516d25
commit 578fcee611
70 changed files with 6828 additions and 9625 deletions
Download patch file Download diff file Expand all files Collapse all files

12
LastenradBayern/TINK/LastenradBayern.projitems
View file

@ -142,18 +142,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoAGB.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoDatenschutz.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoLicenses.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoRentBike.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoTypesOfBikes.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\InfoImpressum.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoTypesOfBikes.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoRentBike.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoLicenses.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoImpressum.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoDatenschutz.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\InfoAGB.html" />
<EmbeddedResource Include="$(MSBuildThisFileDirectory)View\Account\AccountPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
@ -195,7 +184,6 @@
<Folder Include="$(MSBuildThisFileDirectory)View\Login\" />
<Folder Include="$(MSBuildThisFileDirectory)View\Map\" />
<Folder Include="$(MSBuildThisFileDirectory)View\MyBikes\" />
<Folder Include="$(MSBuildThisFileDirectory)HtmlResouces\V01\" />
<Folder Include="$(MSBuildThisFileDirectory)HtmlResouces\V02\" />
</ItemGroup>
<ItemGroup>

9
LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
View file

@ -8,16 +8,17 @@ namespace TINK.View.Contact
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class FeesAndBikesPage : TabbedPage
{
public HelpContactViewModel ViewModel { get; }
public FeesAndBikesPageViewModel ViewModel { get; }
public FeesAndBikesPage ()
{
InitializeComponent();
ViewModel = new HelpContactViewModel(
ViewModel = new FeesAndBikesPageViewModel(
App.ModelRoot.NextActiveUri.Host,
App.ModelRoot.IsSiteCachingOn,
resourceName => ViewModelResourceHelper.GetSource(resourceName));
App.ModelRoot.ResourceUrls.FeesResourcePath,
App.ModelRoot.ResourceUrls.BikesResourcePath,
App.ModelRoot.IsSiteCachingOn);
BindingContext = ViewModel;

2
LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml
View file

@ -1,7 +1,7 @@
<?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.TabbedPageInfo"
x:Class="TINK.View.Info.InfoPage"
x:Name="TabbedInfoPage">
<!--Pages can be added as references or inline-->
<ContentPage Title="App">

11
LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
View file

@ -6,16 +6,19 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Info
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class TabbedPageInfo : TabbedPage
public partial class InfoPage : TabbedPage
{
public InfoViewModel ViewModel { get; }
public InfoPageViewModel ViewModel { get; }
public TabbedPageInfo()
public InfoPage()
{
InitializeComponent();
ViewModel = new InfoViewModel(
ViewModel = new InfoPageViewModel(
App.ModelRoot.NextActiveUri.Host,
App.ModelRoot.ResourceUrls.AgbResourcePath,
App.ModelRoot.ResourceUrls.PrivacyResourcePath,
App.ModelRoot.ResourceUrls.ImpressResourcePath,
App.ModelRoot.IsSiteCachingOn,
resourceName => ViewModelResourceHelper.GetSource(resourceName));
TabbedInfoPage.BindingContext = ViewModel;

2
LastenradBayern/TINK/View/RootShell/AppShell.xaml
View file

@ -100,7 +100,7 @@
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
<ShellContent
Title="{Binding TabbedPageIngoTitle}"
ContentTemplate="{DataTemplate info:TabbedPageInfo}">
ContentTemplate="{DataTemplate info:InfoPage}">
<ShellContent.FlyoutIcon>
<FontImageSource Glyph="{StaticResource IconInfo}" Color="Black" FontFamily="FA-S" />
</ShellContent.FlyoutIcon>

2
LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
View file

@ -43,7 +43,7 @@ namespace TINK.View
return typeof(SettingsPage);
case ViewTypes.TabbedPageInfo:
return typeof(TabbedPageInfo);
return typeof(InfoPage);
case ViewTypes.FeesAndBikesPage:
return typeof(FeesAndBikesPage);

2
LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
View file

@ -70,7 +70,7 @@ namespace TINK.ViewModel.Root
CheckAddItem(typeof(ContactPage)); // Feedback and contact
CheckAddItem(typeof(TabbedPageInfo)); // About sharee.bike
CheckAddItem(typeof(InfoPage)); // About sharee.bike
}
/// <summary>Adds a menu item to master detail menu.</summary>

4
LastenradBayern/TINK/ViewModel/RootMasterDetail/Helper.cs
View file

@ -53,7 +53,7 @@ namespace TINK.ViewModel.MasterDetail
{
return AppResources.MarkingFeedbackAndContact;
}
else if (type == typeof(TabbedPageInfo))
else if (type == typeof(InfoPage))
{
return AppResources.MarkingAbout;
}
@ -102,7 +102,7 @@ namespace TINK.ViewModel.MasterDetail
{
return "\uf095";
}
else if (type == typeof(TabbedPageInfo))
else if (type == typeof(InfoPage))
{
return "\uf05a";
}