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

Version 3.0.345

Browse source
This commit is contained in:
Oliver Hauff 2022-10-12 21:02:34 +02:00
parent 4476717f26
commit 48667b2660
17 changed files with 154 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
View file

@ -11,26 +11,6 @@
</Grid>
</Shell.TitleView>
<!--Pages can be added as references or inline-->
<ContentPage
IsEnabled="{Binding IsIdle}"
Title="{x:Static resources:AppResources.MarkingTabFees}">
<ContentPage.Content>
<Grid>
<WebView
x:Name="InfoRentBikeWebView"
HeightRequest="1000"
WidthRequest="1000"
Source="{Binding RentBikeText}"/>
<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.MarkingTabBikes}">
@ -51,4 +31,24 @@
</Grid>
</ContentPage.Content>
</ContentPage>
<ContentPage
IsEnabled="{Binding IsIdle}"
Title="{x:Static resources:AppResources.MarkingTabFees}">
<ContentPage.Content>
<Grid>
<WebView
x:Name="InfoRentBikeWebView"
HeightRequest="1000"
WidthRequest="1000"
Source="{Binding RentBikeText}"/>
<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
Meinkonrad/TINK/View/RootShell/AppShell.xaml
View file

@ -61,7 +61,6 @@
<ShellContent
Title="{x:Static resources:AppResources.MarkingSettings}"
Icon="menu_settings.png"
IsVisible="{Binding IsSettingsPageVisible}"
ContentTemplate="{DataTemplate settings:SettingsPage}">
</ShellContent>
</FlyoutItem>

6
Meinkonrad/TINK/ViewModel/RootShell/AppShellViewModel.cs
View file

@ -1,4 +1,4 @@
using System.ComponentModel;
using System.ComponentModel;
using TINK.MultilingualResources;
using TINK.Services;
using TINK.Services.CopriApi.ServerUris;
@ -18,7 +18,6 @@ namespace TINK.ViewModel.RootShell
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsFindBikePageVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsAccountPageVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsLoginPageVisible)));
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(IsSettingsPageVisible)));
};
// Update flyout view model whenever theme is switched.
@ -63,9 +62,6 @@ namespace TINK.ViewModel.RootShell
public bool IsLoginPageVisible => !App.ModelRoot.ActiveUser.IsLoggedIn;
public bool IsSettingsPageVisible => App.ModelRoot.Uris.ActiveUri.Host.GetIsCopri()
|| App.ModelRoot.ActiveUser.IsLoggedIn;
public string TabbedPageIngoTitle => AppResources.MarkingAbout;
}