Version 3.0.371

This commit is contained in:
Anja 2023-08-31 12:31:38 +02:00
parent bdb2dec1c1
commit 6d22dbf40b
145 changed files with 2289 additions and 764 deletions

View file

@ -82,7 +82,7 @@ namespace TINK.View
/// <param name="co2Saving"> Co2 saving information.</param>
/// <returns>User feedback.</returns>
Task<IUserFeedback> DisplayUserFeedbackPopup(
IBattery battery = null,
IBatteryMutable battery = null,
string co2Saving = null);
#if USCSHARP9

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.Themes.Konrad">
<ResourceDictionary
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
x:Class="TINK.Themes.Konrad">
<!--Main color-->
<Color x:Key="primary-back-title-color">#D21113</Color>
@ -134,14 +136,22 @@
<Setter Property="FontSize" Value="20"/>
<Setter Property="TextTransform" Value="Uppercase"/>
<Setter Property="TextColor" Value="White"/>
<Setter Property="VerticalOptions" Value="Center"/>
<Setter Property="VerticalOptions" Value="Start"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="Grid.Column" Value="1"/>
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>
<!--TabbedPage-->
<Style x:Key="TabbedPageStyle" TargetType="TabbedPage">
<Setter Property="BarBackgroundColor" Value="White"/>
<Setter Property="UnselectedTabColor" Value="DimGray"/>
<Setter Property="SelectedTabColor" Value="{x:DynamicResource primary-back-title-color}"/>
<Setter Property="android:TabbedPage.ToolbarPlacement" Value="Default"/>
</Style>
</ResourceDictionary>

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8" ?>
<ResourceDictionary xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.Themes.ShareeBike">
<ResourceDictionary
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"
x:Class="TINK.Themes.ShareeBike">
<!--Main color-->
<Color x:Key="primary-back-title-color">#009899</Color>
@ -149,18 +151,25 @@
<!--Navbar-->
<Style x:Key="Label-Navbar" TargetType="Label">
<Setter Property="FontSize" Value="20"/>
<!--<Setter Property="TextTransform" Value="Uppercase"/>-->
<Setter Property="TextColor" Value="White"/>
<Setter Property="FontSize" Value="20"/>
<Setter Property="TextColor" Value="White"/>
<Setter Property="FontFamily" Value="RobotoRegular"/>
<Setter Property="VerticalOptions" Value="Center"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="Grid.Column" Value="1"/>
</Style>
<Setter Property="VerticalOptions" Value="Start"/>
<Setter Property="HorizontalOptions" Value="Start"/>
<Setter Property="Padding" Value="0,12,0,12"/>
</Style>
<Style x:Key="Image-Navbar" TargetType="Image">
<Setter Property="Source" Value="swk_theme.png"/>
<Setter Property="Aspect" Value="AspectFill"/>
<Setter Property="Grid.ColumnSpan" Value="2"/>
</Style>
<!--TabbedPage-->
<Style x:Key="TabbedPageStyle" TargetType="TabbedPage">
<Setter Property="BarBackgroundColor" Value="White"/>
<Setter Property="UnselectedTabColor" Value="DimGray"/>
<Setter Property="SelectedTabColor" Value="{x:DynamicResource primary-back-title-color}"/>
<Setter Property="android:TabbedPage.ToolbarPlacement" Value="Default"/>
</Style>
</ResourceDictionary>