The MIT License (MIT)
- Copyright (c) 2016 James Montemagno / Refractored LLC
+ Copyright (c) 2016 James Montemagno / Refractored LLC
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -571,7 +571,7 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+
+
+
@@ -18,9 +23,16 @@
diff --git a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
index aeafabe..4216b3e 100644
--- a/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Account/AccountPage.xaml.cs
@@ -8,6 +8,7 @@ using TINK.View.MasterDetail;
using System;
using TINK.Model.Device;
using TINK.ViewModel.Account;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
namespace TINK.View.Account
{
@@ -149,7 +150,7 @@ namespace TINK.View.Account
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
index acba893..3a66490 100644
--- a/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
+++ b/LastenradBayern/TINK/View/Bike/ILockItBike.xaml
@@ -5,6 +5,7 @@
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:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
mc:Ignorable="d"
x:Class="TINK.View.Bike.ILockItBike">
@@ -25,6 +26,15 @@
HorizontalTextAlignment="Center"
IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
Text="{Binding DisplayId}"/>
+
+
+
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib">
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index 12406d6..9312d9f 100644
--- a/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/LastenradBayern/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -1,7 +1,7 @@
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
-using TINK.Model.Bike.BluetoothLock;
namespace TINK.View.BikesAtStation
{
@@ -23,6 +23,7 @@ namespace TINK.View.BikesAtStation
using TINK.ViewModel.BikesAtStation;
using TINK.ViewModel.Bikes;
using Xamarin.CommunityToolkit.Extensions;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
[XamlCompilation(XamlCompilationOptions.Compile)]
#if USEFLYOUT
@@ -241,7 +242,7 @@ namespace TINK.View.BikesAtStation
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index 660ac31..04f6a90 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -3,8 +3,13 @@
xmlns:conv="clr-namespace:TINK.View"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- x:Class="TINK.View.Contact.ContactPage"
- Title="{x:Static resources:AppResources.MarkingFeedbackAndContact}">
+ x:Class="TINK.View.Contact.ContactPage">
+
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
index 3b513a1..451d443 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
@@ -1,6 +1,7 @@
using Serilog;
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
#if USEFLYOUT
using TINK.View.MasterDetail;
@@ -118,7 +119,7 @@ namespace TINK.View.Contact
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
#if USEFLYOUT
diff --git a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
index f361c49..b740d4a 100644
--- a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml
@@ -4,8 +4,13 @@
xmlns:maps="clr-namespace:Xamarin.Forms.GoogleMaps;assembly=Xamarin.Forms.GoogleMaps"
xmlns:bindings="clr-namespace:Xamarin.Forms.GoogleMaps.Bindings;assembly=Xamarin.Forms.GoogleMaps.Bindings"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- x:Class="TINK.View.Contact.SelectStationPage"
- Title="{x:Static resources:AppResources.MarkingSelectStationPage}">
+ x:Class="TINK.View.Contact.SelectStationPage">
+
+
+
+
diff --git a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
index 1f2373b..08f0319 100644
--- a/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -10,6 +10,7 @@ namespace TINK.View.Contact
{
using Serilog;
using TINK.Model;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.ViewModel.Contact;
[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -115,7 +116,7 @@ namespace TINK.View.Contact
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
#if USEFLYOUT
diff --git a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
index d3712e6..7d1d5fa 100644
--- a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
index d8de845..7469312 100644
--- a/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
@@ -1,4 +1,5 @@
-using Serilog;
+using System.Globalization;
+using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.Login;
using Xamarin.Forms;
@@ -51,6 +52,7 @@ namespace TINK.View.CopriWebView
ManageAccount.BindingContext = new ManageAccountViewModel(
App.ModelRoot.ActiveUser.SessionCookie,
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
}
diff --git a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
index 859f2f2..8d5e2f6 100644
--- a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
index a31f44e..666b74c 100644
--- a/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
@@ -1,4 +1,5 @@
+using System.Globalization;
using Serilog;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
@@ -43,6 +44,7 @@ namespace TINK.View.CopriWebView
PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
}
diff --git a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
index 613911b..8c9200f 100644
--- a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
+++ b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
index ddf23c1..6d5fd7b 100644
--- a/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
+++ b/LastenradBayern/TINK/View/CopriWebView/RegisterPage.xaml.cs
@@ -1,4 +1,5 @@
+using System.Globalization;
using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.CopriWebView;
@@ -46,6 +47,7 @@ namespace TINK.View.CopriWebView
RegisterView.BindingContext = new RegisterPageViewModel(
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
diff --git a/LastenradBayern/TINK/View/FeedbackPopup.xaml b/LastenradBayern/TINK/View/FeedbackPopup.xaml
index ccbfdff..d83d3b7 100644
--- a/LastenradBayern/TINK/View/FeedbackPopup.xaml
+++ b/LastenradBayern/TINK/View/FeedbackPopup.xaml
@@ -4,7 +4,9 @@
xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
xmlns:local="clr-namespace:TINK.View"
x:TypeArguments="local:FeedbackPopup+Result"
- x:Class="TINK.View.FeedbackPopup">
+ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+ x:Class="TINK.View.FeedbackPopup">
@@ -19,25 +21,28 @@
-
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
+
+
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
index d8c73aa..4ae1f98 100644
--- a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
+++ b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using Xamarin.CommunityToolkit.UI.Views;
using Xamarin.Forms.Xaml;
@@ -8,22 +9,41 @@ namespace TINK.View
public partial class FeedbackPopup : Popup
{
/// Constructs user feedback popup.
+ ///
+ /// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+ ///
+ public int? CurrentChargeBars { get; set; }
+
///
/// Holds whether bike is broken or not.
///
diff --git a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
index eebc428..ad7f168 100644
--- a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
+++ b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
@@ -2,8 +2,13 @@
+ x:Class="TINK.View.Contact.FeesAndBikesPage">
+
+
+
+
diff --git a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
index 547ef95..7379ff7 100644
--- a/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
@@ -1,7 +1,7 @@
using TINK.ViewModel;
+using TINK.ViewModel.Contact;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
-using TINK.ViewModel.Contact;
namespace TINK.View.Contact
{
@@ -10,7 +10,7 @@ namespace TINK.View.Contact
{
public FeesAndBikesPageViewModel ViewModel { get; }
- public FeesAndBikesPage ()
+ public FeesAndBikesPage()
{
InitializeComponent();
@@ -26,7 +26,7 @@ namespace TINK.View.Contact
InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
/// Info about types of bikes.
- InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
+ InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
}
/// Called when page is shown.
diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml
index ce36d0f..4a1e82a 100644
--- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml
+++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml
@@ -3,8 +3,13 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
x:Class="TINK.View.FindBike.FindBikePage"
- xmlns:local_bike="clr-namespace:TINK.View.Bike"
- Title="{x:Static resources:AppResources.MarkingFindBike}">
+ xmlns:local_bike="clr-namespace:TINK.View.Bike">
+
+
+
+
diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
index 3b9a651..8d3c226 100644
--- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -1,8 +1,9 @@
-using Serilog;
-using System;
+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.ViewModel.FindBike;
using Xamarin.CommunityToolkit.Extensions;
@@ -11,13 +12,13 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.FindBike
{
- [XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class FindBikePage : ContentPage, IViewService
- {
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class FindBikePage : ContentPage, IViewService
+ {
/// Refernce to view model.
FindBikePageViewModel m_oViewModel = null;
- public FindBikePage () { }
+ public FindBikePage() { }
///
/// Invoked when page is shown.
@@ -145,7 +146,7 @@ namespace TINK.View.FindBike
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
index 0291304..8aa6c88 100644
--- a/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
#if USEFLYOUT
using TINK.View.MasterDetail;
#endif
@@ -17,9 +18,9 @@ namespace TINK.View.Info.BikeInfo
public partial class BikeInfoCarouselPage : CarouselPage, IViewService
#endif
{
- public BikeInfoCarouselPage ()
- {
- InitializeComponent ();
+ public BikeInfoCarouselPage()
+ {
+ InitializeComponent();
ItemsSource = new BikeInfoViewModel(
resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
@@ -122,7 +123,7 @@ namespace TINK.View.Info.BikeInfo
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml
index 0d85dcc..ec5efb3 100644
--- a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml
+++ b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml
@@ -3,8 +3,13 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
x:Class="TINK.View.Info.InfoPage"
- x:Name="TabbedInfoPage"
- Title="{x:Static resources:AppResources.MarkingAbout}">
+ x:Name="TabbedInfoPage">
+
+
+
+
diff --git a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
index ab402b8..e4ca437 100644
--- a/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Info/InfoTabbedPage.xaml.cs
@@ -1,4 +1,5 @@
-using TINK.ViewModel;
+using System.Globalization;
+using TINK.ViewModel;
using TINK.ViewModel.Info;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@@ -20,6 +21,7 @@ namespace TINK.View.Info
App.ModelRoot.ResourceUrls.PrivacyResourcePath,
App.ModelRoot.ResourceUrls.ImpressResourcePath,
App.ModelRoot.IsSiteCachingOn,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
resourceName => ViewModelResourceHelper.GetSource(resourceName));
TabbedInfoPage.BindingContext = ViewModel;
diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml b/LastenradBayern/TINK/View/Login/LoginPage.xaml
index d384334..423bef3 100644
--- a/LastenradBayern/TINK/View/Login/LoginPage.xaml
+++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml
@@ -2,8 +2,14 @@
+ x:Class="TINK.View.Login.LoginPage">
+
+
+
+
+
@@ -51,4 +57,103 @@
+
+
+
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
index 2d7f6c8..03e860c 100644
--- a/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
#if USEFLYOUT
using TINK.View.MasterDetail;
@@ -17,15 +18,15 @@ namespace TINK.View.Login
public partial class LoginPage : ContentPage, IViewService
#endif
{
- public LoginPage ()
- {
- InitializeComponent ();
+ public LoginPage()
+ {
+ InitializeComponent();
var l_oModel = App.ModelRoot;
#if !BACKSTYLE
var l_oViewModel = new LoginPageViewModel(
- l_oModel,
- (url) => DependencyService.Get< IExternalBrowserService>().OpenUrl(url),
+ l_oModel,
+ (url) => DependencyService.Get().OpenUrl(url),
this);
LoginPageView.BindingContext = l_oViewModel;
@@ -81,7 +82,7 @@ namespace TINK.View.Login
/// Pushes a page onto the modal stack.
/// DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
- }
- }
\ No newline at end of file
+ }
+}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml b/LastenradBayern/TINK/View/Map/MapPage.xaml
index 2bba277..b9a180a 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml
@@ -4,13 +4,26 @@
xmlns:maps="clr-namespace:Xamarin.Forms.GoogleMaps;assembly=Xamarin.Forms.GoogleMaps"
xmlns:bindings="clr-namespace:Xamarin.Forms.GoogleMaps.Bindings;assembly=Xamarin.Forms.GoogleMaps.Bindings"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- x:Class="TINK.View.Map.MapPage"
- Title="{x:Static resources:AppResources.MarkingMapPage}">
-
-
+
+
+
+
+
+
+
-
+
@@ -19,38 +32,96 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
index ca79f45..e512d74 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
@@ -9,6 +9,7 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Map
{
using Serilog;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.ViewModel.Map;
[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -120,7 +121,7 @@ namespace TINK.View.Map
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
#if USEFLYOUT
diff --git a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml
index 6464851..0c01985 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml
+++ b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml
@@ -27,7 +27,9 @@
diff --git a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
index 28c4607..921e19f 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/MiniSurveyPage.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.ViewModel.MiniSurvey;
using Xamarin.CommunityToolkit.Extensions;
using Xamarin.Forms;
@@ -24,6 +25,7 @@ namespace TINK.View.MiniSurvey
BindingContext = vm;
MiniSurveyListView.ItemsSource = vm;
}
+
///
/// Displays alert message.
///
@@ -92,7 +94,7 @@ namespace TINK.View.MiniSurvey
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
index 22c771e..d18c3dd 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/Question/CheckOneViewCell.xaml.cs
@@ -3,12 +3,12 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.MiniSurvey.Question
{
- [XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class CheckOneViewCell : ViewCell
- {
- public CheckOneViewCell ()
- {
- InitializeComponent ();
- }
- }
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class CheckOneViewCell : ViewCell
+ {
+ public CheckOneViewCell()
+ {
+ InitializeComponent();
+ }
+ }
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs b/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
index 95443a1..2f7c71e 100644
--- a/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
+++ b/LastenradBayern/TINK/View/MiniSurvey/Question/FreeTextViewCell.xaml.cs
@@ -4,12 +4,12 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.MiniSurvey.Question
{
- [XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class FreeTextViewCell : ViewCell
- {
- public FreeTextViewCell ()
- {
- InitializeComponent ();
- }
- }
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class FreeTextViewCell : ViewCell
+ {
+ public FreeTextViewCell()
+ {
+ InitializeComponent();
+ }
+ }
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml
index 97e97ba..4cbcdde 100644
--- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml
+++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml
@@ -3,8 +3,13 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="TINK.View.MyBikes.MyBikesPage"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- xmlns:local_bike="clr-namespace:TINK.View.Bike"
- Title="{x:Static resources:AppResources.MarkingMyBikes}">
+ xmlns:local_bike="clr-namespace:TINK.View.Bike">
+
+
+
+
diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 24d5fcd..071db56 100644
--- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -12,6 +12,7 @@ namespace TINK.View.MyBikes
{
using Serilog;
using TINK.Model;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
using TINK.ViewModel.MyBikes;
using Xamarin.CommunityToolkit.Extensions;
@@ -40,7 +41,7 @@ namespace TINK.View.MyBikes
{
// Don't repeat the initialization if it has been completed already.
if (isInitializationStarted) return;
- isInitializationStarted = true;
+ isInitializationStarted = true;
if (m_oViewModel != null)
{
@@ -179,7 +180,7 @@ namespace TINK.View.MyBikes
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
index fda3c9f..f3a52bb 100644
--- a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -31,7 +31,7 @@ namespace TINK.View.Root
// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
-
+
var navigationPage = Detail as NavigationPage;
if (navigationPage == null)
{
diff --git a/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs b/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
index 8e451e7..ca04b1e 100644
--- a/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
+++ b/LastenradBayern/TINK/View/RootMasterDetail/MainPageMenuItem.cs
@@ -12,8 +12,8 @@ namespace TINK.View
}
public MainPageMenuItem(
- int p_iId,
- Type p_oTypeOfPage,
+ int p_iId,
+ Type p_oTypeOfPage,
string p_strTitle = null)
{
TargetType = p_oTypeOfPage;
diff --git a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
index 5e2b1dd..0bea38d 100644
--- a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
+++ b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
@@ -1,13 +1,14 @@
+ BackgroundColor="#009BDB"
+ x:Class="TINK.View.RootShell.FlyoutHeader"
+ HeightRequest="195">
-
+
+
+
+
Constructs a settings page.
- public SettingsPage ()
- {
- InitializeComponent ();
+ public SettingsPage()
+ {
+ InitializeComponent();
var l_oModel = App.ModelRoot;
@@ -73,7 +74,7 @@ namespace TINK.View.Settings
/// True if user pressed accept.
- public new async Task DisplayAlert(string p_strTitle, string p_strMessage, string p_strAccept, string p_strCancel)
+ public new async Task 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);
///
@@ -104,7 +105,7 @@ namespace TINK.View.Settings
/// Pushes a page onto the modal stack.
/// Pops a page from the modal stack.
public Task PopModalAsync()
@@ -149,7 +150,7 @@ namespace TINK.View.Settings
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
#if USERFEEDBACKDLG_TRYOUT
diff --git a/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs b/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
index 711c1d2..d5c0c76 100644
--- a/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
+++ b/LastenradBayern/TINK/View/ViewTypesTypeProvider.cs
@@ -1,17 +1,17 @@
using System;
+using TINK.View.BikesAtStation;
using TINK.View.Contact;
using TINK.View.CopriWebView;
using TINK.View.Info;
using TINK.View.Info.BikeInfo;
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.BikesAtStation;
using Xamarin.Forms;
-using TINK.View.MiniSurvey;
namespace TINK.View
{
diff --git a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml
index 017b775..0f33d00 100644
--- a/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml
+++ b/LastenradBayern/TINK/View/WhatsNew/Agb/AgbPage.xaml
@@ -9,8 +9,11 @@
HeightRequest="1000"
WidthRequest="500"
Source="{Binding InfoAgb}"/>
- Invoked when page is shown.
protected async override void OnAppearing()
- => await agbViewModel.OnAppearing();
+ => await agbViewModel.OnAppearing();
/// Reference to view model.
AgbViewModel agbViewModel;
@@ -75,7 +78,7 @@ namespace TINK.View.WhatsNew.Agb
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
\ No newline at end of file
diff --git a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml
index a39a74c..7a12aa9 100644
--- a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml
+++ b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml
@@ -34,7 +34,9 @@
diff --git a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
index df80f4f..f519596 100644
--- a/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
+++ b/LastenradBayern/TINK/View/WhatsNew/WhatsNewPage.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@@ -79,7 +80,7 @@ namespace TINK.View.WhatsNew
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
///
@@ -97,7 +98,7 @@ namespace TINK.View.WhatsNew
WhatsNewViewModel?.OnDisappearing(() =>
{
- App.ModelRoot.SetWhatsNewWasShown();
+ App.ModelRoot.WhatsNew.WasShownInCurrentSession = true;
App.ModelRoot.Save();
});
}
diff --git a/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs b/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
index 4cdc6d6..15a5a4d 100644
--- a/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
+++ b/LastenradBayern/TINK/ViewModel/RootFlyout/RootPageViewModel.cs
@@ -87,11 +87,13 @@ namespace TINK.ViewModel.Root
p_oType,
m_oEntryDictionary.Count);
- MenuItems.Add(new RootPageFlyoutMenuItem {
+ MenuItems.Add(new RootPageFlyoutMenuItem
+ {
TargetType = p_oType,
GlyphCode = Helper.GetGlyphCode(p_oType),
Title = Helper.GetCaption(p_oType),
- Id = m_oEntryDictionary[p_oType] }) ;
+ Id = m_oEntryDictionary[p_oType]
+ });
}
/// Removes a page from menu.
@@ -119,7 +121,7 @@ namespace TINK.ViewModel.Root
// Update flyout view model whenever theme is switched.
App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
{
- if (!(sender is ServicesContainerMutable themes))
+ if (!(sender is ServicesContainerMutableT themes))
return;
MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
diff --git a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
index 796b5d1..5a08227 100644
--- a/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
+++ b/LastenradBayern/TINK/ViewModel/RootShell/AppShellViewModel.cs
@@ -1,9 +1,9 @@
-using TINK.MultilingualResources;
-using TINK.ViewModel.Info;
-using TINK.Services.CopriApi.ServerUris;
-using System.ComponentModel;
-using TINK.View.Themes;
+using System.ComponentModel;
+using TINK.MultilingualResources;
using TINK.Services;
+using TINK.Services.CopriApi.ServerUris;
+using TINK.View.Themes;
+using TINK.ViewModel.Info;
namespace TINK.ViewModel.RootShell
{
@@ -24,7 +24,7 @@ namespace TINK.ViewModel.RootShell
// Update flyout view model whenever theme is switched.
App.ModelRoot.Themes.PropertyChanged += (sender, eventargs) =>
{
- if (!(sender is ServicesContainerMutable themes))
+ if (!(sender is ServicesContainerMutableT themes))
return;
MasterDetailMenuTitlte = GetMasterDetailMenuTitle(themes.Active);
diff --git a/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs b/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
index 5ff89b5..363155a 100644
--- a/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
+++ b/LastenradBayern/TINK/ViewModel/ViewModelResourceHelper.cs
@@ -1,7 +1,7 @@
-using Serilog;
-using System.IO;
+using System.IO;
using System.Reflection;
using System.Text;
+using Serilog;
namespace TINK.ViewModel
{
@@ -30,7 +30,7 @@ namespace TINK.ViewModel
public static string GetSource(string resrouceName)
{
var l_oRessourceName = RessourcePrefix + resrouceName;
- Log.Verbose($"Using this resource prefix { RessourcePrefix}.");
+ Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
// note that the prefix includes the trailing period '.' that is required
var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
var stream = assembly.GetManifestResourceStream(l_oRessourceName);
diff --git a/LockItBLE/LockItBLE.csproj b/LockItBLE/LockItBLE.csproj
index 568bfaa..b0bd833 100644
--- a/LockItBLE/LockItBLE.csproj
+++ b/LockItBLE/LockItBLE.csproj
@@ -4,13 +4,14 @@
netstandard2.0
TINK
Debug;Release
+ 3.0
-
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
index 023426b..cedb32a 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
@@ -1,19 +1,19 @@
-using Plugin.BLE.Abstractions;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Plugin.BLE.Abstractions;
using Plugin.BLE.Abstractions.Contracts;
using Plugin.BLE.Abstractions.Exceptions;
+using Polly;
+using Polly.Retry;
using Serilog;
-using System;
-using System.Threading.Tasks;
-using TINK.Services.BluetoothLock.Crypto;
-using TINK.Services.BluetoothLock.Tdo;
-using System.Threading;
-using System.Collections.Generic;
-using TINK.Services.BluetoothLock.Exception;
-using Xamarin.Essentials;
using TINK.Model.Connector;
using TINK.Model.Device;
-using Polly.Retry;
-using Polly;
+using TINK.Services.BluetoothLock.Crypto;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Services.BluetoothLock.Tdo;
+using Xamarin.Essentials;
namespace TINK.Services.BluetoothLock.BLE
{
@@ -364,14 +364,15 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not get device state. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not get device state. Platform must not be unknown and bluetooth code must be run on main thread.");
}
DeviceState? state;
Log.ForContext().Debug("Request to get connection state.");
try
{
- state = GetDeviceState(Device.State);
+ state = Device?.State.GetDeviceState()
+ ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
}
catch (System.Exception exception)
{
@@ -404,7 +405,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not reconnect to lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not reconnect to lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
// Check if key is available.
@@ -477,7 +478,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not authenticate. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not authenticate. Platform must not be unknown and bluetooth code must be run on main thread.");
}
if (device == null)
@@ -494,7 +495,8 @@ namespace TINK.Services.BluetoothLock.BLE
Log.ForContext().Debug("Retrieving connection state is in context of auth.");
try
{
- deviceState = GetDeviceState(device.State);
+ deviceState = device?.State.GetDeviceState()
+ ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
}
catch (System.Exception exception)
{
@@ -659,20 +661,41 @@ namespace TINK.Services.BluetoothLock.BLE
Log.ForContext().Debug("Encrypted access key written successfully.{Key}{Seed}{AuthCharacteristic}{CommandWritten}", ToSerilogString(crypto.KeyCopri), ToSerilogString(lockInfo.K_seed), ToSerilogString(authCharacteristic), "***");
}
- /// Gets the entire lock state, like locking state (open/ close) and GUID.
+ /// Gets the lock state like locking state (open/ close).
///
+ /// Lock state is first byte of of value read from state characteristic ("0000baaa-1212-efde-1523-785fef13d123").
+ /// Values are as follows
+ /// Open = 0x00,
+ /// Closed = 0x01,
+ /// Unknown = 0x02,
+ /// CouldntCloseMoving = 0x03,
+ /// CouldntOpenBoldBlocked = 0x04,
+ /// CouldntCloseBoldBlocked = 0x05
+ /// TINK.Services.BluetoothLock.Tdo.LockitLockingState.
+ ///
+ /// Lock state.
+ /// App is not connected to lock.
+ /// Getting state characteristic to read from failed.
+ ///
+ /// Call not from main thread or unkonwn platform detected or
+ /// query device state (connected, disconnected, ....) failed for an unknown reason or returned an unexpected value or
+ /// reading state characteristic failed or reading from characteristic was empty.
+ ///
+ /// Exceptions thrown by PluginBle::ICharacteristic.ReasAsync.
public async Task GetLockStateAsync(bool doWaitRetry = false)
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not get lock state. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not get lock state. Platform must not be unknown and bluetooth code must be run on main thread.");
}
DeviceState? deviceState;
Log.ForContext().Debug("Request to get connection state in context of getting locking state.");
try
{
- deviceState = GetDeviceState(Device.State);
+ deviceState = Device?.State.GetDeviceState()
+ ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
}
catch (System.Exception exception)
{
@@ -725,7 +748,7 @@ namespace TINK.Services.BluetoothLock.BLE
try
{
- state = doWaitRetry
+ state = doWaitRetry
? await _retryPollicy.ExecuteAsync(async () => await readAsyncDelegate())
: await readAsyncDelegate();
}
@@ -757,14 +780,15 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not get battery percentage. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not get battery percentage. Platform must not be unknown and bluetooth code must be run on main thread.");
}
DeviceState? deviceState;
Log.ForContext().Debug("Request to get battery percentage in context of getting locking state.");
try
{
- deviceState = GetDeviceState(Device.State);
+ deviceState = Device?.State.GetDeviceState()
+ ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
}
catch (System.Exception exception)
{
@@ -841,7 +865,8 @@ namespace TINK.Services.BluetoothLock.BLE
Log.ForContext().Debug("Request to get connection state in context of opening/ closing lock.");
try
{
- deviceState = GetDeviceState(Device.State);
+ deviceState = Device?.State.GetDeviceState()
+ ?? throw new System.Exception("Can not get bluetooth device state. State must not be null.");
}
catch (System.Exception exception)
{
@@ -916,7 +941,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not turn alarm off. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
}
var alarmCharacteristic = await GetAlarmCharacteristicAsync();
@@ -959,7 +984,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not turn alarm off. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not turn alarm off. Platform must not be unknown and bluetooth code must be run on main thread.");
}
ICharacteristic alarmCharacteristic = await GetAlarmCharacteristicAsync();
@@ -994,7 +1019,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not set sound settings. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not set sound settings. Platform must not be unknown and bluetooth code must be run on main thread.");
}
ICharacteristic soundCharacteristic = await GetSoundCharacteristicAsync();
@@ -1028,7 +1053,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not set alarm settings. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not set alarm settings. Platform must not be unknown and bluetooth code must be run on main thread.");
}
ICharacteristic alarmSettingsCharacteristic = await GetAlarmSettingsCharacteristicAsync();
@@ -1067,26 +1092,6 @@ namespace TINK.Services.BluetoothLock.BLE
return data;
}
- private static DeviceState GetDeviceState(Plugin.BLE.Abstractions.DeviceState state)
- {
- switch (state)
- {
- case Plugin.BLE.Abstractions.DeviceState.Disconnected:
- return DeviceState.Disconnected;
-
- case Plugin.BLE.Abstractions.DeviceState.Connecting:
- return DeviceState.Connecting;
-
- case Plugin.BLE.Abstractions.DeviceState.Connected:
- return DeviceState.Connected;
-
- case Plugin.BLE.Abstractions.DeviceState.Limited:
- return DeviceState.Limited;
-
- default:
- throw new ArgumentException($"Can not convert state {state}");
- }
- }
/// Disconnect from bluetooth lock.
public async Task Disconnect() => await Adapter.DisconnectDeviceAsync(Device);
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
index ad0ad60..283f519 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByGuidService.cs
@@ -1,18 +1,18 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Plugin.BLE;
-using Plugin.BLE.Abstractions.Contracts;
-using Plugin.BLE.Abstractions;
+using System;
+using System.Collections.Generic;
using System.Linq;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Model.Connector;
-using Serilog;
using System.Threading;
-using System;
-using TINK.Services.BluetoothLock.Exception;
-using Xamarin.Essentials;
-using TINK.Model.Device;
+using System.Threading.Tasks;
using LockItShared.Services.BluetoothLock;
+using Plugin.BLE;
+using Plugin.BLE.Abstractions;
+using Plugin.BLE.Abstractions.Contracts;
+using Serilog;
+using TINK.Model.Connector;
+using TINK.Model.Device;
+using TINK.Services.BluetoothLock.Exception;
+using TINK.Services.BluetoothLock.Tdo;
+using Xamarin.Essentials;
namespace TINK.Services.BluetoothLock.BLE
{
@@ -20,7 +20,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
/// Constructs a LockItByGuidService object.
/// Returns true if location permission is required (Android) but on given.
- private Func> IsLocationPermissionMissingDelegate {get; }
+ private Func> IsLocationPermissionMissingDelegate { get; }
/// Returns true if location service is required (Android) and off.
private Func IsLocationRequiredAndOffDelegate { get; }
- private Func> AuthenticateDelegate { get; set; }
+ private Func> AuthenticateDelegate { get; set; }
public LockItByScanServiceBase(
ICipher cipher,
Func> authenticateDelegate,
IBluetoothLE bluetoothLE,
Func> isLocationPermissionMissingDelegate,
- Func isLocationRequiredAndOffDelegate) : base(cipher)
+ Func isLocationRequiredAndOffDelegate) : base(cipher)
{
BluetoothService = bluetoothLE
?? throw new ArgumentException($"Can not instantiate {nameof(LockItByScanServiceBase)}- object. No bluetooth service available.");
@@ -56,7 +56,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not connect to lock by name. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not connect to lock by name. Platform must not be unknown and bluetooth code must be run on main thread.");
}
Log.ForContext().Debug($"Request to connect to device {authInfo.Id}.");
@@ -66,6 +66,7 @@ namespace TINK.Services.BluetoothLock.BLE
if (lockIt != null && lockIt.GetDeviceState() == DeviceState.Connected)
{
// Nothing to do
+ Log.ForContext().Debug($"Nothing to do. Lock is already connected.");
return await lockIt.GetLockStateAsync();
}
@@ -78,6 +79,7 @@ namespace TINK.Services.BluetoothLock.BLE
}
// Device has not yet been discovered.
+ Log.ForContext().Verbose("Starting scan for new devices...");
var newlyDiscovertedDevice = await ScanForNewDevices(new List { authInfo.Id }, connectTimeout);
var bleDevice = newlyDiscovertedDevice.FirstOrDefault(x => x.Name.GetBluetoothLockId() == authInfo.Id);
@@ -92,22 +94,26 @@ namespace TINK.Services.BluetoothLock.BLE
break;
case BluetoothState.Off:
+ Log.ForContext().Debug("Lock probable not found because bluetooth is off.");
throw new ConnectBluetoothNotOnException();
default:
+ Log.ForContext().Debug("Lock probable not found because unexpected bluetooth state {state} detected.", bluetoothState);
throw new ConnectBluetoothNotOnException(bluetoothState);
}
if (await IsLocationPermissionMissingDelegate())
{
+ Log.ForContext().Debug("Lock probable not found because missing location permission.");
throw new ConnectLocationPermissionMissingException();
}
if (IsLocationRequiredAndOffDelegate())
{
+ Log.ForContext().Debug("Lock probable not found because location is off.");
throw new ConnectLocationOffException();
}
- Log.ForContext().Debug("Can not connect because device was not discovered.");
+ Log.ForContext().Debug("Can not connect because device was not discovered. List of discovered devices {deviceList}.", String.Join(";", newlyDiscovertedDevice?.Select(x => x?.Id)));
throw new OutOfReachException();
}
@@ -125,7 +131,7 @@ namespace TINK.Services.BluetoothLock.BLE
}
catch (System.Exception exception)
{
- Log.ForContext().Error("Can not connect to device by name. {Exception}", exception);
+ Log.ForContext().Error("Can not connect to device by name. {Exception}", exception);
if (exception is TaskCanceledException)
{
// A timeout occurred.
@@ -179,7 +185,7 @@ namespace TINK.Services.BluetoothLock.BLE
// Connect to newly discovered devices.
foreach (var lockInfo in locksInfoToScanFor)
{
- var device = newlyDiscovertedDevicesList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == lockInfo.Id);
+ var device = newlyDiscovertedDevicesList.FirstOrDefault(x => x.Name.GetBluetoothLockId() == lockInfo.Id);
if (device == null)
{
// No device found for given lock.
@@ -200,7 +206,7 @@ namespace TINK.Services.BluetoothLock.BLE
}
catch (System.Exception exception)
{
- Log.ForContext().Error("Can not connect to lock. {Exception}", exception);
+ Log.ForContext().Error("Can not connect to lock. {Exception}", exception);
continue;
}
@@ -292,7 +298,7 @@ namespace TINK.Services.BluetoothLock.BLE
throw;
}
}
-
+
return newlyDiscovertedDevicesList;
}
}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
index 89b15f8..4900817 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServiceEventBased.cs
@@ -1,6 +1,6 @@
-using Plugin.BLE.Abstractions.Contracts;
-using System;
+using System;
using System.Threading.Tasks;
+using Plugin.BLE.Abstractions.Contracts;
using TINK.Model.Device;
namespace TINK.Services.BluetoothLock.BLE
@@ -12,6 +12,7 @@ namespace TINK.Services.BluetoothLock.BLE
(bleDevice, authInfo, adapter) => LockItEventBased.Authenticate(bleDevice, authInfo, adapter, cipher),
bluetoothLE,
isLocationPermissionMissingDelegate,
- isLocationRequiredAndOffDelegate) { }
+ isLocationRequiredAndOffDelegate)
+ { }
}
}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
index 45854f4..67d6659 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItByScanServicePolling.cs
@@ -1,6 +1,6 @@
-using Plugin.BLE.Abstractions.Contracts;
-using System;
+using System;
using System.Threading.Tasks;
+using Plugin.BLE.Abstractions.Contracts;
using TINK.Model.Device;
namespace TINK.Services.BluetoothLock.BLE
@@ -12,6 +12,7 @@ namespace TINK.Services.BluetoothLock.BLE
(bleDevice, authInfo, adapter) => LockItPolling.Authenticate(bleDevice, authInfo, adapter, cipher),
bluetoothLE,
isLocationPermissionMissingDelegate,
- isLocationRequiredAndOffDelegate) { }
+ isLocationRequiredAndOffDelegate)
+ { }
}
}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
index 94351fe..08c7c7b 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
@@ -1,10 +1,10 @@
-using Plugin.BLE.Abstractions.Contracts;
-using Plugin.BLE.Abstractions.EventArgs;
-using Serilog;
-using System;
+using System;
using System.Threading;
using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
+using Plugin.BLE.Abstractions.Contracts;
+using Plugin.BLE.Abstractions.EventArgs;
+using Serilog;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.Model.Device;
using TINK.Services.BluetoothLock.Exception;
using TINK.Services.BluetoothLock.Tdo;
@@ -53,7 +53,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not open lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
LockitLockingState? lockingState = (await GetLockStateAsync())?.State;
@@ -88,7 +88,8 @@ namespace TINK.Services.BluetoothLock.BLE
{
lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
batteryStateCharacteristic.ValueUpdated += batteryStateCharcteristicChanged;
- } catch (System.Exception ex)
+ }
+ catch (System.Exception ex)
{
Log.ForContext().Error("Subscribing to events when opening lock failed.{Exception}", ex);
return await Task.FromResult((LockitLockingState?)null);
@@ -122,13 +123,14 @@ namespace TINK.Services.BluetoothLock.BLE
finally
{
try
- {
+ {
await lockStateCharacteristic.StopUpdatesAsync();
await batteryStateCharacteristic.StopUpdatesAsync();
lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
batteryStateCharacteristic.ValueUpdated -= batteryStateCharcteristicChanged;
- } catch (System.Exception ex)
+ }
+ catch (System.Exception ex)
{
Log.ForContext().Error("Sopping updates/ unsubscribing from events when opening lock failed.{Exception}", ex);
}
@@ -168,7 +170,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not close lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
// Get current state
@@ -196,8 +198,8 @@ namespace TINK.Services.BluetoothLock.BLE
EventHandler lockStateCharcteristicChanged = (sender, args) => GetStateValue(tcs, args.Characteristic.Value);
- try
- {
+ try
+ {
lockStateCharacteristic.ValueUpdated += lockStateCharcteristicChanged;
}
catch (System.Exception ex)
@@ -214,7 +216,7 @@ namespace TINK.Services.BluetoothLock.BLE
Log.ForContext().Error("Starting update when closing lock failed.{Exception}", ex);
return await Task.FromResult((LockitLockingState?)null);
}
-
+
try
{
Log.ForContext().Debug($"Request to closed lock. Current state is {lockingState}, counter value {ActivateLockWriteCounter}.");
@@ -232,11 +234,12 @@ namespace TINK.Services.BluetoothLock.BLE
finally
{
try
- {
+ {
await lockStateCharacteristic.StopUpdatesAsync();
lockStateCharacteristic.ValueUpdated -= lockStateCharcteristicChanged;
- } catch (System.Exception ex)
+ }
+ catch (System.Exception ex)
{
Log.ForContext().Error("Sopping update/ unsubscribing from events when closing lock failed.{Exception}", ex);
}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
index dc9d789..d29c07c 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
@@ -1,9 +1,9 @@
-using Plugin.BLE.Abstractions.Contracts;
-using Serilog;
-using System;
+using System;
using System.Diagnostics;
using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
+using Plugin.BLE.Abstractions.Contracts;
+using Serilog;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.Model.Device;
using TINK.Services.BluetoothLock.Exception;
using TINK.Services.BluetoothLock.Tdo;
@@ -46,13 +46,12 @@ namespace TINK.Services.BluetoothLock.BLE
cipher,
() => new LockItPolling(device, adapter, cipher));
- /// Opens lock.
- /// Locking state.
+ /// Opens the lock.
public async override Task OpenAsync()
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not open lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not open lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
var info = await GetLockStateAsync();
@@ -136,7 +135,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not close lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not close lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
// Get current state
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
index 83cca7e..e0875d5 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
@@ -1,13 +1,13 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
using System.Linq;
-using TINK.Services.BluetoothLock.Tdo;
-using TINK.Model.Connector;
-using System;
+using System.Threading.Tasks;
using Serilog;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
+using TINK.Model.Connector;
using TINK.Model.Device;
+using TINK.Services.BluetoothLock.Tdo;
using Xamarin.Essentials;
-using TINK.Model.Bike.BluetoothLock;
namespace TINK.Services.BluetoothLock.BLE
{
@@ -35,7 +35,7 @@ namespace TINK.Services.BluetoothLock.BLE
/// deviceList,
- IEnumerable locksInfo,
+ IEnumerable locksInfo,
TimeSpan connectTimeout)
{
// Get list of target locks without invalid entries.
@@ -52,7 +52,7 @@ namespace TINK.Services.BluetoothLock.BLE
continue;
}
- var lockInfo = validLocksInfo.FirstOrDefault(x => x.Id == device. Name.GetBluetoothLockId() || x.Guid == device.Guid);
+ var lockInfo = validLocksInfo.FirstOrDefault(x => x.Id == device.Name.GetBluetoothLockId() || x.Guid == device.Guid);
if (lockInfo == null)
{
@@ -83,7 +83,7 @@ namespace TINK.Services.BluetoothLock.BLE
/// > GetLocksStateAsync(
- IEnumerable locksInfo,
+ IEnumerable locksInfo,
TimeSpan connectTimeout)
{
if (locksInfo.Count() == 0)
@@ -126,7 +126,7 @@ namespace TINK.Services.BluetoothLock.BLE
/// > CheckConnectMissing(
- IEnumerable locksInfo,
+ IEnumerable locksInfo,
TimeSpan connectTimeout);
/// Gets a lock by bike Id.
@@ -154,7 +154,7 @@ namespace TINK.Services.BluetoothLock.BLE
{
if (DeviceInfo.Platform != DevicePlatform.Unknown && MainThread.IsMainThread == false)
{
- throw new System.Exception("Can not disconnect from lock. Bluetooth code must be run on main thread");
+ throw new System.Exception("Can not disconnect from lock. Platform must not be unknown and bluetooth code must be run on main thread.");
}
Log.ForContext().Debug($"Request to disconnect from device {bikeId}/ {bikeGuid}.");
diff --git a/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs b/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs
new file mode 100644
index 0000000..b2ae6d9
--- /dev/null
+++ b/LockItBLE/Services/BluetoothLock/BLE/PluginBleHelper.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace TINK.Services.BluetoothLock.BLE
+{
+ public static class PluginBleHelper
+ {
+ ///
+ /// Maps Plugin.BLE device state to LockItShared device state.
+ ///
+ /// Unexpected state detected.
+ public static DeviceState GetDeviceState(this Plugin.BLE.Abstractions.DeviceState state)
+ {
+ switch (state)
+ {
+ case Plugin.BLE.Abstractions.DeviceState.Disconnected:
+ return DeviceState.Disconnected;
+
+ case Plugin.BLE.Abstractions.DeviceState.Connecting:
+ return DeviceState.Connecting;
+
+ case Plugin.BLE.Abstractions.DeviceState.Connected:
+ return DeviceState.Connected;
+
+ case Plugin.BLE.Abstractions.DeviceState.Limited:
+ return DeviceState.Limited;
+
+ default:
+ throw new ArgumentException($"Can not convert state Plugin.BLE-{state}.");
+ }
+ }
+
+ }
+}
diff --git a/LockItBLE/Services/BluetoothLock/StateChecker.cs b/LockItBLE/Services/BluetoothLock/StateChecker.cs
index 2a51740..a5e34e8 100644
--- a/LockItBLE/Services/BluetoothLock/StateChecker.cs
+++ b/LockItBLE/Services/BluetoothLock/StateChecker.cs
@@ -1,6 +1,6 @@
-using Plugin.BLE.Abstractions.Contracts;
-using System;
+using System;
using System.Threading.Tasks;
+using Plugin.BLE.Abstractions.Contracts;
namespace TINK.Services.BluetoothLock
{
diff --git a/LockItShared/LockItShared.csproj b/LockItShared/LockItShared.csproj
index b889eee..5235d76 100644
--- a/LockItShared/LockItShared.csproj
+++ b/LockItShared/LockItShared.csproj
@@ -6,6 +6,7 @@
true
true
Debug;Release
+ 3.0
netstandard2.0
@@ -23,7 +24,7 @@
diff --git a/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs b/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
index c2366f1..8dd80c3 100644
--- a/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/BluetoothLock/ILockInfo.cs
@@ -1,4 +1,4 @@
-namespace TINK.Model.Bike.BluetoothLock
+namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
{
public interface ILockInfo
{
diff --git a/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs b/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
index 76a8508..29ba27c 100644
--- a/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/BluetoothLock/LockInfo.cs
@@ -1,9 +1,9 @@
-using TINK.Model.Connector;
-using Newtonsoft.Json;
-using System;
+using System;
using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using TINK.Model.Connector;
-namespace TINK.Model.Bike.BluetoothLock
+namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
{
/// Locking states.
public enum LockingState
@@ -53,7 +53,7 @@ namespace TINK.Model.Bike.BluetoothLock
public bool IsGuidValid => Guid != TextToLockItTypeHelper.INVALIDLOCKGUID;
- public override bool Equals(object obj) => this.Equals(obj as LockInfo);
+ public override bool Equals(object obj) => this.Equals(obj as LockInfo);
public bool Equals(LockInfo other)
{
@@ -76,7 +76,7 @@ namespace TINK.Model.Bike.BluetoothLock
public static bool operator ==(LockInfo lhs, LockInfo rhs)
{
- if (Object.ReferenceEquals(lhs, null))
+ if (Object.ReferenceEquals(lhs, null))
return Object.ReferenceEquals(rhs, null) ? true /*null == null = true*/: false;
return lhs.Equals(rhs);
@@ -101,25 +101,25 @@ namespace TINK.Model.Bike.BluetoothLock
private readonly LockInfo LockInfo = new LockInfo();
- public byte[] UserKey { get => LockInfo.UserKey; set => LockInfo.UserKey = value; }
-
+ public byte[] UserKey { get => LockInfo.UserKey; set => LockInfo.UserKey = value; }
+
public byte[] AdminKey { get => LockInfo.AdminKey; set => LockInfo.AdminKey = value; }
-
+
public byte[] Seed { get => LockInfo.Seed; set => LockInfo.Seed = value; }
public int Id { get => LockInfo.Id; set => LockInfo.Id = value; }
public Guid Guid { get => LockInfo.Guid; set => LockInfo.Guid = value; }
- public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
+ public LockingState State { get => LockInfo.State; set => LockInfo.State = value; }
public LockInfo Build()
{
// Ensure consistency.
- if ((UserKey?.Length > 0 || Seed?.Length > 0)
+ if ((UserKey?.Length > 0 || Seed?.Length > 0)
&& (UserKey?.Length == 0 || Seed?.Length == 0 || !LockInfo.IsIdValid))
- throw new ArgumentException($"Can not build {typeof(LockInfo).Name}. Lock parameters must either be all know or all unknown.");
-
+ throw new ArgumentException($"Can not build {typeof(LockInfo).Name}. Lock parameters must either be all know or all unknown.");
+
if (UserKey == null) UserKey = new byte[0];
if (AdminKey == null) AdminKey = new byte[0];
if (Seed == null) Seed = new byte[0];
diff --git a/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs b/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
index d9fb310..f99b424 100644
--- a/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/CopriLock/ILockInfo.cs
@@ -1,4 +1,4 @@
-namespace TINK.Model.Bikes.Bike.CopriLock
+namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
{
public interface ILockInfo
{
diff --git a/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs b/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
index ba70142..8926857 100644
--- a/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
+++ b/LockItShared/Model/Bikes/Bike/CopriLock/LockInfo.cs
@@ -1,8 +1,8 @@
-using Newtonsoft.Json;
-using System;
+using System;
using System.Runtime.Serialization;
+using Newtonsoft.Json;
-namespace TINK.Model.Bikes.Bike.CopriLock
+namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
{
/// Locking states.
public enum LockingState
diff --git a/LockItShared/Model/Connector/TextToLockItTypeHelper.cs b/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
index a3fc465..0998719 100644
--- a/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
+++ b/LockItShared/Model/Connector/TextToLockItTypeHelper.cs
@@ -10,7 +10,7 @@ namespace TINK.Model.Connector
/// Lock GUID which representing a non valid id.
public readonly static Guid INVALIDLOCKGUID = new Guid();
-
+
/// First part of advertisement name.
public static string ISHAREITADVERTISMENTTITLE = "ISHAREIT";
diff --git a/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs b/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
index 7f05cc0..1cb52c8 100644
--- a/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
+++ b/LockItShared/Services/BluetoothLock/Crypto/AuthCryptoHelper.cs
@@ -58,7 +58,7 @@ namespace TINK.Services.BluetoothLock.Crypto
}
accessKey[accessKey.Length - 1] += 1;
-
+
var keyCopri = KeyCopri;
byte[] acccessKeyEncrypted;
try
diff --git a/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs b/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
index 4ae287a..b52a593 100644
--- a/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/AlreadyConnectedException.cs
@@ -2,6 +2,6 @@
{
public class AlreadyConnectedException : System.Exception
{
- public AlreadyConnectedException() : base("Invalid reconnect call detected. Device is already connected.") {}
+ public AlreadyConnectedException() : base("Invalid reconnect call detected. Device is already connected.") { }
}
}
diff --git a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
index 7bfe65b..fe16c52 100644
--- a/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/BluetoothDisconnectedException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
diff --git a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
index fa36119..b05ee4c 100644
--- a/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/ConnectLocationPermissionMissingException.cs
@@ -4,6 +4,6 @@ namespace TINK.Services.BluetoothLock.Exception
{
public class ConnectLocationPermissionMissingException : System.Exception
{
- public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
+ public ConnectLocationPermissionMissingException() : base(Resources.ErrorConnectLockLocationPermissingMissingException) { }
}
}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
index f0ca123..45f11bd 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseBoldBlockedException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
index a415a55..f36a1d1 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseInconsistentStateExecption.cs
@@ -1,5 +1,5 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.MultilingualResources;
namespace TINK.Services.BluetoothLock.Exception
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
index 11c9b6b..86d36cd 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntCloseMovingException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
index 2d13ce7..211634d 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldIsBlockedException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
@@ -8,7 +8,7 @@ namespace TINK.Services.BluetoothLock.Exception
public class CouldntOpenBoldIsBlockedException : StateAwareException
{
public CouldntOpenBoldIsBlockedException() : base(
- LockingState.UnknownFromHardwareError,
+ LockingState.UnknownFromHardwareError,
MultilingualResources.Resources.ErrorOpenLockBoldBlocked)
{
}
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
index 4c939be..ddb04f1 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenBoldWasBlockedException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
diff --git a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
index 54c3f15..019d3bd 100644
--- a/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/CouldntOpenInconsistentStateExecption.cs
@@ -1,5 +1,5 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.MultilingualResources;
namespace TINK.Services.BluetoothLock.Exception
diff --git a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
index 7f3134a..bc61537 100644
--- a/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/OutOfReachException.cs
@@ -1,6 +1,7 @@
namespace TINK.Services.BluetoothLock.Exception
{
/// Thrown whenever lock is out of reach.
+ /// If fired when scan for devices does not result in lock beeing found.
public class OutOfReachException : System.Exception
{
}
diff --git a/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs b/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
index 77cdc98..5d0d704 100644
--- a/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
+++ b/LockItShared/Services/BluetoothLock/Exception/StateAwareException.cs
@@ -1,4 +1,4 @@
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
namespace TINK.Services.BluetoothLock.Exception
{
diff --git a/LockItShared/Services/BluetoothLock/ILockService.cs b/LockItShared/Services/BluetoothLock/ILockService.cs
index 4c67aa7..bc56583 100644
--- a/LockItShared/Services/BluetoothLock/ILockService.cs
+++ b/LockItShared/Services/BluetoothLock/ILockService.cs
@@ -18,7 +18,7 @@ namespace TINK.Services.BluetoothLock
Task ReconnectAsync(
LockInfoAuthTdo authInfo,
TimeSpan connectTimeout);
-
+
/// Opens lock.
/// State of lock after performing open operation.
Task OpenAsync();
@@ -42,7 +42,7 @@ namespace TINK.Services.BluetoothLock
/// GetLockStateAsync(bool doWaitRetry = false);
-
+
Task SetSoundAsync(SoundSettings settings);
Task SetAlarmSettingsAsync(AlarmSettings settings);
diff --git a/LockItShared/Services/BluetoothLock/ILocksService.cs b/LockItShared/Services/BluetoothLock/ILocksService.cs
index c6e715e..b6c9030 100644
--- a/LockItShared/Services/BluetoothLock/ILocksService.cs
+++ b/LockItShared/Services/BluetoothLock/ILocksService.cs
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
-using TINK.Model.Bike.BluetoothLock;
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using TINK.Services.BluetoothLock.Tdo;
namespace TINK.Services.BluetoothLock
@@ -12,22 +12,22 @@ namespace TINK.Services.BluetoothLock
ITimeOutProvider TimeOut { get; set; }
/// Gets lock info for all lock in reach.///
- /// > GetLocksStateAsync(
- IEnumerable locksInfo,
+ IEnumerable locksInfo,
TimeSpan connectTimeout);
/// Connects to lock.
/// ConnectAsync(
- LockInfoAuthTdo authInfo,
+ LockInfoAuthTdo authInfo,
TimeSpan connectTimeout);
/// Gets a lock by bike Id.
/// Lock object
- ILockService this[int bikeId] { get; }
+ ILockService this[int bikeId] { get; }
/// Disconnects lock.
/// UpdateById(
- this IEnumerable locksInfo,
+ this IEnumerable locksInfo,
IEnumerable locksInfoTdo)
{
var locksInfoUpdated = new List();
@@ -30,7 +30,7 @@ namespace TINK.Model.Bike.BluetoothLock
var state = lockInfoTdo.State.HasValue ? lockInfoTdo.State.Value.GetLockingState() : LockingState.UnknownDisconnected;
locksInfoUpdated.Add(state != lockInfo.State || lockInfoTdo.Guid != lockInfo.Guid
- ? new LockInfo.Builder(lockInfo) { Guid = lockInfoTdo.Guid, State = state}.Build() // State has changed, update required.
+ ? new LockInfo.Builder(lockInfo) { Guid = lockInfoTdo.Guid, State = state }.Build() // State has changed, update required.
: lockInfo);
}
@@ -65,6 +65,6 @@ namespace TINK.Model.Bike.BluetoothLock
return new LockInfoAuthTdo.Builder() { Id = lockInfo.Id, Guid = lockInfo.Guid, K_u = lockInfo.UserKey, K_a = lockInfo.AdminKey, K_seed = lockInfo.Seed }.Build();
}
-
+
}
}
diff --git a/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs b/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
index 97ffed6..bdbd143 100644
--- a/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
+++ b/LockItShared/Services/BluetoothLock/LockItByGuidServiceHelper.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.Text;
namespace LockItShared.Services.BluetoothLock
{
@@ -9,7 +8,7 @@ namespace LockItShared.Services.BluetoothLock
///
/// Holds guids of developent locks to ensure that no wrong guid are provided by COPRI
///
- public static Dictionary DevelGuids = new Dictionary
+ public static Dictionary DevelGuids = new Dictionary
{
{ 2200537, new Guid("00000000-0000-0000-0000-d589a8023487") },
{ 2200543, new Guid("00000000-0000-0000-0000-cc141a6f68bb") },
diff --git a/LockItShared/Services/BluetoothLock/NullLock.cs b/LockItShared/Services/BluetoothLock/NullLock.cs
index 8ed2842..f932664 100644
--- a/LockItShared/Services/BluetoothLock/NullLock.cs
+++ b/LockItShared/Services/BluetoothLock/NullLock.cs
@@ -19,44 +19,44 @@ namespace TINK.Services.BluetoothLock
public Task ReconnectAsync(LockInfoAuthTdo authInfo, TimeSpan connectTimeout) =>
throw new NotImplementedException();
- public string Name =>
+ public string Name =>
throw new NotImplementedException();
- public Guid Guid =>
+ public Guid Guid =>
throw new NotImplementedException();
- public int Id =>
+ public int Id =>
throw new NotImplementedException();
public async Task OpenAsync() =>
await Task.FromResult((LockitLockingState?)null);
- public async Task CloseAsync() =>
+ public async Task CloseAsync() =>
await Task.FromResult((LockitLockingState?)null);
- public Task GetBatteryPercentageAsync() =>
+ public Task GetBatteryPercentageAsync() =>
throw new System.Exception($"Can not get battery percentage. Lock {BikeId} not found.");
public DeviceState? GetDeviceState() =>
throw new NotImplementedException();
- public Task GetIsAlarmOffAsync() =>
+ public Task GetIsAlarmOffAsync() =>
throw new System.Exception($"Can not get whether alarm is on or off. Lock {BikeId} not found.");
public Task GetLockStateAsync(bool doWaitRetry = false) =>
throw new NotImplementedException();
- public Task SetIsAlarmOffAsync(bool isActivated) =>
+ public Task SetIsAlarmOffAsync(bool isActivated) =>
throw new System.Exception($"Can not set alarm {isActivated}. Lock {BikeId} not found.");
- public async Task SetSoundAsync(SoundSettings settings) =>
+ public async Task SetSoundAsync(SoundSettings settings) =>
await Task.FromResult(false);
public async Task SetAlarmSettingsAsync(AlarmSettings settings) =>
await Task.FromResult(false);
/// Disconnect from bluetooth lock.
- public Task Disconnect() =>
+ public Task Disconnect() =>
throw new NotImplementedException();
}
diff --git a/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs b/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
index 127ff00..417b57e 100644
--- a/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
+++ b/LockItShared/Services/BluetoothLock/Tdo/LockInfoAuthTdo.cs
@@ -1,5 +1,5 @@
-using TINK.Model.Connector;
-using System;
+using System;
+using TINK.Model.Connector;
namespace TINK.Services.BluetoothLock.Tdo
{
diff --git a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
index 774c7fd..d8dbfa8 100644
--- a/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
+++ b/LockItShared/Services/BluetoothLock/Tdo/LockInfoTdo.cs
@@ -6,15 +6,15 @@ namespace TINK.Services.BluetoothLock.Tdo
public enum LockitLockingState
{
Open = 0x00,
-
+
Closed = 0x01,
-
+
Unknown = 0x02,
CouldntCloseMoving = 0x03,
-
+
CouldntOpenBoldBlocked = 0x04,
-
+
CouldntCloseBoldBlocked = 0x05
}
diff --git a/LockItShared/Services/BluetoothLock/TimeOutProvider.cs b/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
index c5a08e6..e678ba3 100644
--- a/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
+++ b/LockItShared/Services/BluetoothLock/TimeOutProvider.cs
@@ -23,8 +23,8 @@ namespace TINK.Services.BluetoothLock
public TimeSpan MultiConnect => TimeOuts.ToArray()[0];
- public TimeSpan GetSingleConnect(int countOfTry) => countOfTry < TimeOuts.Count
- ? TimeOuts.ToArray()[countOfTry]
- : new TimeSpan(TimeOuts.ToArray()[0].Ticks * Math.Min(countOfTry, MAXIMUMFACTORTIMEOUT)) ;
+ public TimeSpan GetSingleConnect(int countOfTry) => countOfTry < TimeOuts.Count
+ ? TimeOuts.ToArray()[countOfTry]
+ : new TimeSpan(TimeOuts.ToArray()[0].Ticks * Math.Min(countOfTry, MAXIMUMFACTORTIMEOUT));
}
}
diff --git a/LockItShared/Services/CopriLock/Exception/CouldntCloseBoldBlockedException.cs b/LockItShared/Services/CopriLock/Exception/CouldntCloseBoldBlockedException.cs
deleted file mode 100644
index db986f4..0000000
--- a/LockItShared/Services/CopriLock/Exception/CouldntCloseBoldBlockedException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace TINK.Services.CopriLock.Exception
-{
- public class CouldntCloseBoldBlockedException : System.Exception
- {
- }
-}
diff --git a/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldIsBlockedException.cs b/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldIsBlockedException.cs
deleted file mode 100644
index 4ac84d1..0000000
--- a/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldIsBlockedException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace TINK.Services.CopriLock.Exception
-{
- public class CouldntOpenBoldIsBlockedException : System.Exception
- {
- }
-}
diff --git a/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldWasBlockedException.cs b/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldWasBlockedException.cs
deleted file mode 100644
index a7e41a6..0000000
--- a/LockItShared/Services/CopriLock/Exception/CouldntOpenBoldWasBlockedException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace TINK.Services.CopriLock.Exception
-{
- public class CouldntOpenBoldWasBlockedException : System.Exception
- {
- }
-}
diff --git a/LockItShared/Services/CopriLock/Exception/CounldntCloseMovingException.cs b/LockItShared/Services/CopriLock/Exception/CounldntCloseMovingException.cs
deleted file mode 100644
index 775ee23..0000000
--- a/LockItShared/Services/CopriLock/Exception/CounldntCloseMovingException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace TINK.Services.CopriLock.Exception
-{
- public class CounldntCloseMovingException : System.Exception
- {
- }
-}
diff --git a/LockItShared/Services/CopriLock/Exception/OutOfReachException.cs b/LockItShared/Services/CopriLock/Exception/OutOfReachException.cs
deleted file mode 100644
index fd4419b..0000000
--- a/LockItShared/Services/CopriLock/Exception/OutOfReachException.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-
-namespace TINK.Services.CopriLock.Exception
-{
- public class OutOfReachException : System.Exception
- {
- }
-}
diff --git a/LockItShared/Services/CopriLock/Exception/StateAwareException.cs b/LockItShared/Services/CopriLock/Exception/StateAwareException.cs
deleted file mode 100644
index 768a579..0000000
--- a/LockItShared/Services/CopriLock/Exception/StateAwareException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using TINK.Model.Bikes.Bike.CopriLock;
-
-namespace TINK.Services.CopriLock.Exception
-{
- public abstract class StateAwareException : System.Exception
- {
- public StateAwareException(LockingState state, string description) : base(description)
- {
- State = state;
- }
-
- /// Holds the state reported by lock.
- public LockingState State { get; }
- }
-}
diff --git a/Meinkonrad/TINK.Android/Assets/01_Blue.png b/Meinkonrad/TINK.Android/Assets/01_Blue.png
deleted file mode 100644
index 9e24128..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/01_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/01_Green.png b/Meinkonrad/TINK.Android/Assets/01_Green.png
deleted file mode 100644
index a2546e8..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/01_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/01_LightBlue.png b/Meinkonrad/TINK.Android/Assets/01_LightBlue.png
deleted file mode 100644
index db51853..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/01_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/01_Red.png b/Meinkonrad/TINK.Android/Assets/01_Red.png
deleted file mode 100644
index ccded93..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/01_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/02_Blue.png b/Meinkonrad/TINK.Android/Assets/02_Blue.png
deleted file mode 100644
index 581387a..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/02_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/02_Green.png b/Meinkonrad/TINK.Android/Assets/02_Green.png
deleted file mode 100644
index dd7f2ba..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/02_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/02_LightBlue.png b/Meinkonrad/TINK.Android/Assets/02_LightBlue.png
deleted file mode 100644
index 56270cd..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/02_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/02_Red.png b/Meinkonrad/TINK.Android/Assets/02_Red.png
deleted file mode 100644
index 698973e..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/02_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/03_Blue.png b/Meinkonrad/TINK.Android/Assets/03_Blue.png
deleted file mode 100644
index 09ec813..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/03_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/03_Green.png b/Meinkonrad/TINK.Android/Assets/03_Green.png
deleted file mode 100644
index 556f816..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/03_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/03_LightBlue.png b/Meinkonrad/TINK.Android/Assets/03_LightBlue.png
deleted file mode 100644
index da4f14c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/03_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/03_Red.png b/Meinkonrad/TINK.Android/Assets/03_Red.png
deleted file mode 100644
index 89a5f0c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/03_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/04_Blue.png b/Meinkonrad/TINK.Android/Assets/04_Blue.png
deleted file mode 100644
index 9e0b460..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/04_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/04_Green.png b/Meinkonrad/TINK.Android/Assets/04_Green.png
deleted file mode 100644
index 9e3dab0..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/04_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/04_LightBlue.png b/Meinkonrad/TINK.Android/Assets/04_LightBlue.png
deleted file mode 100644
index 80ac7f5..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/04_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/04_Red.png b/Meinkonrad/TINK.Android/Assets/04_Red.png
deleted file mode 100644
index 700b2d2..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/04_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/05_Blue.png b/Meinkonrad/TINK.Android/Assets/05_Blue.png
deleted file mode 100644
index a34a55f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/05_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/05_Green.png b/Meinkonrad/TINK.Android/Assets/05_Green.png
deleted file mode 100644
index 1499d23..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/05_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/05_LightBlue.png b/Meinkonrad/TINK.Android/Assets/05_LightBlue.png
deleted file mode 100644
index a4b5934..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/05_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/05_Red.png b/Meinkonrad/TINK.Android/Assets/05_Red.png
deleted file mode 100644
index 4a4204c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/05_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/06_Blue.png b/Meinkonrad/TINK.Android/Assets/06_Blue.png
deleted file mode 100644
index ccca262..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/06_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/06_Green.png b/Meinkonrad/TINK.Android/Assets/06_Green.png
deleted file mode 100644
index b74cd77..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/06_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/06_LightBlue.png b/Meinkonrad/TINK.Android/Assets/06_LightBlue.png
deleted file mode 100644
index afbb450..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/06_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/06_Red.png b/Meinkonrad/TINK.Android/Assets/06_Red.png
deleted file mode 100644
index 3f75e7d..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/06_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/07_Blue.png b/Meinkonrad/TINK.Android/Assets/07_Blue.png
deleted file mode 100644
index 7bf49f8..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/07_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/07_Green.png b/Meinkonrad/TINK.Android/Assets/07_Green.png
deleted file mode 100644
index 4612d5c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/07_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/07_LightBlue.png b/Meinkonrad/TINK.Android/Assets/07_LightBlue.png
deleted file mode 100644
index 97572d4..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/07_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/07_Red.png b/Meinkonrad/TINK.Android/Assets/07_Red.png
deleted file mode 100644
index 7ce84ec..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/07_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/08_Blue.png b/Meinkonrad/TINK.Android/Assets/08_Blue.png
deleted file mode 100644
index 6ab507e..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/08_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/08_Green.png b/Meinkonrad/TINK.Android/Assets/08_Green.png
deleted file mode 100644
index 7f80d1f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/08_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/08_LightBlue.png b/Meinkonrad/TINK.Android/Assets/08_LightBlue.png
deleted file mode 100644
index e254f71..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/08_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/08_Red.png b/Meinkonrad/TINK.Android/Assets/08_Red.png
deleted file mode 100644
index c1d2d14..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/08_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/09_Blue.png b/Meinkonrad/TINK.Android/Assets/09_Blue.png
deleted file mode 100644
index d94442e..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/09_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/09_Green.png b/Meinkonrad/TINK.Android/Assets/09_Green.png
deleted file mode 100644
index a4d0876..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/09_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/09_LightBlue.png b/Meinkonrad/TINK.Android/Assets/09_LightBlue.png
deleted file mode 100644
index f8b0adf..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/09_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/09_Red.png b/Meinkonrad/TINK.Android/Assets/09_Red.png
deleted file mode 100644
index 4a710a6..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/09_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/10_Blue.png b/Meinkonrad/TINK.Android/Assets/10_Blue.png
deleted file mode 100644
index a00e902..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/10_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/10_Green.png b/Meinkonrad/TINK.Android/Assets/10_Green.png
deleted file mode 100644
index 0afa230..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/10_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/10_LightBlue.png b/Meinkonrad/TINK.Android/Assets/10_LightBlue.png
deleted file mode 100644
index f294724..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/10_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/10_Red.png b/Meinkonrad/TINK.Android/Assets/10_Red.png
deleted file mode 100644
index d7f8dda..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/10_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/11_Blue.png b/Meinkonrad/TINK.Android/Assets/11_Blue.png
deleted file mode 100644
index 5bd32f4..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/11_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/11_Green.png b/Meinkonrad/TINK.Android/Assets/11_Green.png
deleted file mode 100644
index 6fda2f3..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/11_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/11_LightBlue.png b/Meinkonrad/TINK.Android/Assets/11_LightBlue.png
deleted file mode 100644
index 8ef25e0..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/11_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/11_Red.png b/Meinkonrad/TINK.Android/Assets/11_Red.png
deleted file mode 100644
index b3cb2a7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/11_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/12_Blue.png b/Meinkonrad/TINK.Android/Assets/12_Blue.png
deleted file mode 100644
index d63a418..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/12_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/12_Green.png b/Meinkonrad/TINK.Android/Assets/12_Green.png
deleted file mode 100644
index 27fb967..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/12_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/12_LightBlue.png b/Meinkonrad/TINK.Android/Assets/12_LightBlue.png
deleted file mode 100644
index 48ff4af..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/12_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/12_Red.png b/Meinkonrad/TINK.Android/Assets/12_Red.png
deleted file mode 100644
index 37e09f7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/12_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/13_Blue.png b/Meinkonrad/TINK.Android/Assets/13_Blue.png
deleted file mode 100644
index 7ef27f2..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/13_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/13_Green.png b/Meinkonrad/TINK.Android/Assets/13_Green.png
deleted file mode 100644
index 2154468..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/13_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/13_LightBlue.png b/Meinkonrad/TINK.Android/Assets/13_LightBlue.png
deleted file mode 100644
index 12268c5..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/13_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/13_Red.png b/Meinkonrad/TINK.Android/Assets/13_Red.png
deleted file mode 100644
index 22c5eb3..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/13_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/14_Blue.png b/Meinkonrad/TINK.Android/Assets/14_Blue.png
deleted file mode 100644
index 9d44634..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/14_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/14_Green.png b/Meinkonrad/TINK.Android/Assets/14_Green.png
deleted file mode 100644
index ce59cdd..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/14_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/14_LightBlue.png b/Meinkonrad/TINK.Android/Assets/14_LightBlue.png
deleted file mode 100644
index ba6c687..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/14_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/14_Red.png b/Meinkonrad/TINK.Android/Assets/14_Red.png
deleted file mode 100644
index 30d0db9..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/14_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/15_Blue.png b/Meinkonrad/TINK.Android/Assets/15_Blue.png
deleted file mode 100644
index c28a8a3..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/15_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/15_Green.png b/Meinkonrad/TINK.Android/Assets/15_Green.png
deleted file mode 100644
index 1f3218a..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/15_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/15_LightBlue.png b/Meinkonrad/TINK.Android/Assets/15_LightBlue.png
deleted file mode 100644
index 58bd0d3..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/15_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/15_Red.png b/Meinkonrad/TINK.Android/Assets/15_Red.png
deleted file mode 100644
index 99a7f96..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/15_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/16_Blue.png b/Meinkonrad/TINK.Android/Assets/16_Blue.png
deleted file mode 100644
index 2904743..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/16_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/16_Green.png b/Meinkonrad/TINK.Android/Assets/16_Green.png
deleted file mode 100644
index d6c6877..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/16_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/16_LightBlue.png b/Meinkonrad/TINK.Android/Assets/16_LightBlue.png
deleted file mode 100644
index 80f4fd7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/16_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/16_Red.png b/Meinkonrad/TINK.Android/Assets/16_Red.png
deleted file mode 100644
index db07df3..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/16_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/17_Blue.png b/Meinkonrad/TINK.Android/Assets/17_Blue.png
deleted file mode 100644
index 86e1198..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/17_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/17_Green.png b/Meinkonrad/TINK.Android/Assets/17_Green.png
deleted file mode 100644
index a7b4962..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/17_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/17_LightBlue.png b/Meinkonrad/TINK.Android/Assets/17_LightBlue.png
deleted file mode 100644
index 9572ed9..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/17_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/17_Red.png b/Meinkonrad/TINK.Android/Assets/17_Red.png
deleted file mode 100644
index 00c6a02..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/17_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/18_Blue.png b/Meinkonrad/TINK.Android/Assets/18_Blue.png
deleted file mode 100644
index 7ba2a30..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/18_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/18_Green.png b/Meinkonrad/TINK.Android/Assets/18_Green.png
deleted file mode 100644
index cce4144..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/18_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/18_LightBlue.png b/Meinkonrad/TINK.Android/Assets/18_LightBlue.png
deleted file mode 100644
index 57454f4..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/18_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/18_Red.png b/Meinkonrad/TINK.Android/Assets/18_Red.png
deleted file mode 100644
index a093217..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/18_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/19_Blue.png b/Meinkonrad/TINK.Android/Assets/19_Blue.png
deleted file mode 100644
index 7e93031..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/19_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/19_Green.png b/Meinkonrad/TINK.Android/Assets/19_Green.png
deleted file mode 100644
index 1b0a434..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/19_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/19_LightBlue.png b/Meinkonrad/TINK.Android/Assets/19_LightBlue.png
deleted file mode 100644
index 3aa1d7c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/19_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/19_Red.png b/Meinkonrad/TINK.Android/Assets/19_Red.png
deleted file mode 100644
index a801bd2..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/19_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/1_grau_72dpi.png b/Meinkonrad/TINK.Android/Assets/1_grau_72dpi.png
deleted file mode 100644
index 886fe01..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/1_grau_72dpi.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/20_Blue.png b/Meinkonrad/TINK.Android/Assets/20_Blue.png
deleted file mode 100644
index 7cc15e8..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/20_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/20_Green.png b/Meinkonrad/TINK.Android/Assets/20_Green.png
deleted file mode 100644
index 7dd903f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/20_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/20_LightBlue.png b/Meinkonrad/TINK.Android/Assets/20_LightBlue.png
deleted file mode 100644
index d7f210e..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/20_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/20_Red.png b/Meinkonrad/TINK.Android/Assets/20_Red.png
deleted file mode 100644
index f20ea6b..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/20_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/21_Blue.png b/Meinkonrad/TINK.Android/Assets/21_Blue.png
deleted file mode 100644
index 8c695af..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/21_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/21_Green.png b/Meinkonrad/TINK.Android/Assets/21_Green.png
deleted file mode 100644
index c70d093..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/21_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/21_LightBlue.png b/Meinkonrad/TINK.Android/Assets/21_LightBlue.png
deleted file mode 100644
index d28c9d7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/21_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/21_Red.png b/Meinkonrad/TINK.Android/Assets/21_Red.png
deleted file mode 100644
index 27a603d..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/21_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/22_Blue.png b/Meinkonrad/TINK.Android/Assets/22_Blue.png
deleted file mode 100644
index 447f95d..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/22_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/22_Green.png b/Meinkonrad/TINK.Android/Assets/22_Green.png
deleted file mode 100644
index 7e4147d..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/22_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/22_LightBlue.png b/Meinkonrad/TINK.Android/Assets/22_LightBlue.png
deleted file mode 100644
index a35563f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/22_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/22_Red.png b/Meinkonrad/TINK.Android/Assets/22_Red.png
deleted file mode 100644
index 7a8b48c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/22_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/23_Blue.png b/Meinkonrad/TINK.Android/Assets/23_Blue.png
deleted file mode 100644
index 6ef491b..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/23_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/23_Green.png b/Meinkonrad/TINK.Android/Assets/23_Green.png
deleted file mode 100644
index 3c5ac6c..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/23_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/23_LightBlue.png b/Meinkonrad/TINK.Android/Assets/23_LightBlue.png
deleted file mode 100644
index e3b737f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/23_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/23_Red.png b/Meinkonrad/TINK.Android/Assets/23_Red.png
deleted file mode 100644
index 3746fe7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/23_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/24_Blue.png b/Meinkonrad/TINK.Android/Assets/24_Blue.png
deleted file mode 100644
index 95daee5..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/24_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/24_Green.png b/Meinkonrad/TINK.Android/Assets/24_Green.png
deleted file mode 100644
index f73a5df..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/24_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/24_LightBlue.png b/Meinkonrad/TINK.Android/Assets/24_LightBlue.png
deleted file mode 100644
index 44e43d7..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/24_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/24_Red.png b/Meinkonrad/TINK.Android/Assets/24_Red.png
deleted file mode 100644
index d8cd5a0..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/24_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/25_Blue.png b/Meinkonrad/TINK.Android/Assets/25_Blue.png
deleted file mode 100644
index 88af691..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/25_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/25_Green.png b/Meinkonrad/TINK.Android/Assets/25_Green.png
deleted file mode 100644
index f5a5372..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/25_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/25_LightBlue.png b/Meinkonrad/TINK.Android/Assets/25_LightBlue.png
deleted file mode 100644
index 85314d6..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/25_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/25_Red.png b/Meinkonrad/TINK.Android/Assets/25_Red.png
deleted file mode 100644
index 1f6aeac..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/25_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/26_Blue.png b/Meinkonrad/TINK.Android/Assets/26_Blue.png
deleted file mode 100644
index 9fb05e6..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/26_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/26_Geen.png b/Meinkonrad/TINK.Android/Assets/26_Geen.png
deleted file mode 100644
index eee254f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/26_Geen.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/26_LightBlue.png b/Meinkonrad/TINK.Android/Assets/26_LightBlue.png
deleted file mode 100644
index e8d7efb..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/26_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/26_Red.png b/Meinkonrad/TINK.Android/Assets/26_Red.png
deleted file mode 100644
index 195f08e..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/26_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/27_Blue.png b/Meinkonrad/TINK.Android/Assets/27_Blue.png
deleted file mode 100644
index b7d6940..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/27_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/27_Green.png b/Meinkonrad/TINK.Android/Assets/27_Green.png
deleted file mode 100644
index 781c3fa..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/27_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/27_LightBlue.png b/Meinkonrad/TINK.Android/Assets/27_LightBlue.png
deleted file mode 100644
index 6e55c8f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/27_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/27_Red.png b/Meinkonrad/TINK.Android/Assets/27_Red.png
deleted file mode 100644
index 3d6371f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/27_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/28_Blue.png b/Meinkonrad/TINK.Android/Assets/28_Blue.png
deleted file mode 100644
index f17417f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/28_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/28_Green.png b/Meinkonrad/TINK.Android/Assets/28_Green.png
deleted file mode 100644
index 71c7595..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/28_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/28_LightBlue.png b/Meinkonrad/TINK.Android/Assets/28_LightBlue.png
deleted file mode 100644
index 405d59d..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/28_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/28_Red.png b/Meinkonrad/TINK.Android/Assets/28_Red.png
deleted file mode 100644
index 1b52019..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/28_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/29_Blue.png b/Meinkonrad/TINK.Android/Assets/29_Blue.png
deleted file mode 100644
index 97021d6..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/29_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/29_Green.png b/Meinkonrad/TINK.Android/Assets/29_Green.png
deleted file mode 100644
index 2168ec8..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/29_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/29_LightBlue.png b/Meinkonrad/TINK.Android/Assets/29_LightBlue.png
deleted file mode 100644
index b1db637..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/29_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/29_Red.png b/Meinkonrad/TINK.Android/Assets/29_Red.png
deleted file mode 100644
index 721231b..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/29_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/30_Blue.png b/Meinkonrad/TINK.Android/Assets/30_Blue.png
deleted file mode 100644
index d6dd8e4..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/30_Blue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/30_Green.png b/Meinkonrad/TINK.Android/Assets/30_Green.png
deleted file mode 100644
index 6015c44..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/30_Green.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/30_LightBlue.png b/Meinkonrad/TINK.Android/Assets/30_LightBlue.png
deleted file mode 100644
index edbc16f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/30_LightBlue.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/30_Red.png b/Meinkonrad/TINK.Android/Assets/30_Red.png
deleted file mode 100644
index c5e3baf..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/30_Red.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/Open_Blue.png b/Meinkonrad/TINK.Android/Assets/Open_Blue.png
index 059f4aa..0539a5d 100644
Binary files a/Meinkonrad/TINK.Android/Assets/Open_Blue.png and b/Meinkonrad/TINK.Android/Assets/Open_Blue.png differ
diff --git a/Meinkonrad/TINK.Android/Assets/Open_Green.png b/Meinkonrad/TINK.Android/Assets/Open_Green.png
index b0ae260..0539a5d 100644
Binary files a/Meinkonrad/TINK.Android/Assets/Open_Green.png and b/Meinkonrad/TINK.Android/Assets/Open_Green.png differ
diff --git a/Meinkonrad/TINK.Android/Assets/Open_LightBlue.png b/Meinkonrad/TINK.Android/Assets/Open_LightBlue.png
index 96ce27a..0539a5d 100644
Binary files a/Meinkonrad/TINK.Android/Assets/Open_LightBlue.png and b/Meinkonrad/TINK.Android/Assets/Open_LightBlue.png differ
diff --git a/Meinkonrad/TINK.Android/Assets/Open_Red.png b/Meinkonrad/TINK.Android/Assets/Open_Red.png
index c076f9a..9291b5e 100644
Binary files a/Meinkonrad/TINK.Android/Assets/Open_Red.png and b/Meinkonrad/TINK.Android/Assets/Open_Red.png differ
diff --git a/Meinkonrad/TINK.Android/Assets/dunkelblau_72dpi.png b/Meinkonrad/TINK.Android/Assets/dunkelblau_72dpi.png
deleted file mode 100644
index 9fe754f..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/dunkelblau_72dpi.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/gruen_72dpi.png b/Meinkonrad/TINK.Android/Assets/gruen_72dpi.png
deleted file mode 100644
index 4c07482..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/gruen_72dpi.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/hellblau_72dpi.png b/Meinkonrad/TINK.Android/Assets/hellblau_72dpi.png
deleted file mode 100644
index 55a01c4..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/hellblau_72dpi.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/Assets/rot_72dpi.png b/Meinkonrad/TINK.Android/Assets/rot_72dpi.png
deleted file mode 100644
index b775191..0000000
Binary files a/Meinkonrad/TINK.Android/Assets/rot_72dpi.png and /dev/null differ
diff --git a/Meinkonrad/TINK.Android/MainActivity.cs b/Meinkonrad/TINK.Android/MainActivity.cs
index 27a4d76..d650ac5 100644
--- a/Meinkonrad/TINK.Android/MainActivity.cs
+++ b/Meinkonrad/TINK.Android/MainActivity.cs
@@ -1,41 +1,55 @@
using Android.App;
-using Android.Content.PM;
-using Android.OS;
using Android.Content;
+using Android.Content.PM;
+using Android.Content.Res;
+using Android.OS;
+using Android.Util;
+using Firebase;
using Java.Interop;
using Plugin.Permissions;
using Xamarin.Forms.Platform.Android.AppLinks;
-using Firebase;
namespace TINK.Droid
{
- [Activity (Label = "Mein konrad", Icon = "@drawable/sharee", Theme="@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
+ [Activity(Label = "Mein konrad", Icon = "@drawable/sharee", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[IntentFilter(new[] { Intent.ActionView },
Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
DataScheme = "https",
- DataHost = "sharee.bike",
- DataPathPrefix = "/meinkonrad",
+ DataHost = "app.sharee.bike",
+ DataPathPrefix = "/App-Meinkonrad",
AutoVerify = true)]
[IntentFilter(new[] { Intent.ActionView },
Categories = new[] { Intent.ActionView, Intent.CategoryBrowsable, Intent.CategoryDefault },
DataScheme = "http",
- DataHost = "sharee.bike",
- DataPathPrefix = "/meinkonrad",
+ DataHost = "app.sharee.bike",
+ DataPathPrefix = "/App-Meinkonrad",
AutoVerify = true)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity
- {
- protected override void OnCreate (Bundle bundle)
- {
+ {
+ private void initFontScale()
+ {
+ Configuration configuration = Resources.Configuration;
+ configuration.FontScale = (float)1;
+ //0.85 small, 1 standard, 1.15 big，1.3 more bigger ，1.45 supper big
+ DisplayMetrics metrics = new DisplayMetrics();
+ WindowManager.DefaultDisplay.GetMetrics(metrics);
+ metrics.ScaledDensity = configuration.FontScale * metrics.Density;
+ BaseContext.Resources.UpdateConfiguration(configuration, metrics);
+ }
+ protected override void OnCreate(Bundle bundle)
+ {
+ initFontScale();
+
TabLayoutResource = Resource.Layout.Tabbar;
- ToolbarResource = Resource.Layout.Toolbar;
+ ToolbarResource = Resource.Layout.Toolbar;
- base.OnCreate (bundle);
+ base.OnCreate(bundle);
- global::Xamarin.Forms.Forms.Init (this, bundle);
+ global::Xamarin.Forms.Forms.Init(this, bundle);
FirebaseApp.InitializeApp(this);
AndroidAppLinks.Init(this);
@@ -53,7 +67,8 @@ namespace TINK.Droid
Context context = ApplicationContext;
new Model.Device.AppInfo(context.PackageManager.GetPackageInfo(context.PackageName, 0).VersionName);
- Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) => {
+ Xamarin.Forms.Forms.ViewInitialized += (object sender, Xamarin.Forms.ViewInitializedEventArgs e) =>
+ {
if (!string.IsNullOrWhiteSpace(e.View.AutomationId))
{
e.NativeView.ContentDescription = e.View.AutomationId;
@@ -87,6 +102,6 @@ namespace TINK.Droid
{
BackdoorMethodHelpers.DoTapPage(stationNr);
}
- }
+ }
}
diff --git a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
index 049a995..b8a87e6 100644
--- a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
+++ b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj
@@ -69,32 +69,38 @@
false
true
+
+ 4.0
+ en-US
+ true
+ true
+
- 1.5.2
+ 1.6.3
- 1.5.2
+ 1.6.3
6.3.0.19
- 2.10.0
+ 2.11.0
3.2.0
@@ -182,16 +188,16 @@
1.2.1.3
- 1.3.0
+ 2.0.4
- 1.7.0
+ 1.7.3
-
- 5.0.0.2244
+ 5.0.0.2515
3.3.0
@@ -265,162 +271,6 @@
TINKLib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -433,210 +283,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -657,38 +303,168 @@
MSBuild:UpdateGeneratedFiles
+
+
+
+
+
+
+
+
+
+
MSBuild:UpdateGeneratedFiles
-
+
MSBuild:UpdateGeneratedFiles
-
+
MSBuild:UpdateGeneratedFiles
-
+
MSBuild:UpdateGeneratedFiles
-
+
MSBuild:UpdateGeneratedFiles
-
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
+ MSBuild:UpdateGeneratedFiles
+
+
+
+
MSBuild:UpdateGeneratedFiles
+
Gets the URL to the app store.
/// The store URL.
- public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
+ public string StoreUrl => $"https://play.google.com/store/apps/details?id={Android.App.Application.Context.PackageName}";
}
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Model/Device/Device.cs b/Meinkonrad/TINK.Android/Model/Device/Device.cs
index 7a40528..d01840b 100644
--- a/Meinkonrad/TINK.Android/Model/Device/Device.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/Device.cs
@@ -11,7 +11,7 @@ namespace TINK.Droid.Model.Device
public string Model => DeviceInfo.Model;
- public string PlatformText => DeviceInfo.Platform.ToString();
+ public DevicePlatform Platform => DeviceInfo.Platform;
public string VersionText => DeviceInfo.VersionString;
diff --git a/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs b/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
index f6b912f..a971c11 100644
--- a/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
+++ b/Meinkonrad/TINK.Android/Model/Device/ExternalBrowseService.cs
@@ -1,6 +1,6 @@
-using TINK.Model.Device;
+using Android.Content;
using TINK.Droid.Model.Device;
-using Android.Content;
+using TINK.Model.Device;
using Xamarin.Forms;
[assembly: Dependency(typeof(ExternalBrowseService))]
@@ -8,8 +8,8 @@ namespace TINK.Droid.Model.Device
{
public class ExternalBrowseService : IExternalBrowserService
{
- /// Opens an external browser.
- /// Opens an external browser.
+ ///
+
- #3647df
+ - #D21113
- true
@@ -31,6 +31,6 @@
diff --git a/Meinkonrad/TINK.iOS/AppDelegate.cs b/Meinkonrad/TINK.iOS/AppDelegate.cs
index eccbce9..20f9554 100644
--- a/Meinkonrad/TINK.iOS/AppDelegate.cs
+++ b/Meinkonrad/TINK.iOS/AppDelegate.cs
@@ -1,36 +1,41 @@
using Foundation;
using UIKit;
using Xamarin.Forms;
+using Xamarin.Forms.Platform.iOS;
namespace TINK.iOS
{
- // The UIApplicationDelegate for the application. This class is responsible for launching the
- // User Interface of the application, as well as listening (and optionally responding) to
- // application events from iOS.
- [Register("AppDelegate")]
- public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
- {
- //
- // This method is invoked when the application has loaded and is ready to run. In this
- // method you should instantiate the window, load the UI into it and then make the window
- // visible.
- //
- // You have 17 seconds to return from this method, or iOS will terminate your application.
- //
- public override bool FinishedLaunching(UIApplication app, NSDictionary options)
- {
- global::Xamarin.Forms.Forms.Init ();
+ // The UIApplicationDelegate for the application. This class is responsible for launching the
+ // User Interface of the application, as well as listening (and optionally responding) to
+ // application events from iOS.
+ [Register("AppDelegate")]
+ public partial class AppDelegate : global::Xamarin.Forms.Platform.iOS.FormsApplicationDelegate
+ {
+ //
+ // This method is invoked when the application has loaded and is ready to run. In this
+ // method you should instantiate the window, load the UI into it and then make the window
+ // visible.
+ //
+ // You have 17 seconds to return from this method, or iOS will terminate your application.
+ //
+ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
+ {
+ global::Xamarin.Forms.Forms.Init();
- new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
+ //Color of Icons in Navigation bar (e.g. burger menu and back arrow)
+ UINavigationBar.Appearance.TintColor = Color.White.ToUIColor();
- Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) => {
+ new iOS.Device.AppInfo(NSBundle.MainBundle.InfoDictionary[new NSString("CFBundleShortVersionString")]?.ToString() ?? string.Empty);
+
+ Forms.ViewInitialized += (object sender, ViewInitializedEventArgs e) =>
+ {
// http://developer.xamarin.com/recipes/testcloud/set-accessibilityidentifier-ios/
if (null != e.View.AutomationId)
{
e.NativeView.AccessibilityIdentifier = e.View.AutomationId;
}
};
- LoadApplication (new TINK.App ());
+ LoadApplication(new TINK.App());
// Required for initialization of Maps, see https://developer.xamarin.com/guides/xamarin-forms/user-interface/map/
Xamarin.FormsGoogleMaps.Init("000000000000000000000000000000000000000");
@@ -38,7 +43,7 @@ namespace TINK.iOS
// Required for initialization of binding package, see https://github.com/nuitsjp/Xamarin.Forms.GoogleMaps.Bindings.
Xamarin.FormsGoogleMapsBindings.Init();
- return base.FinishedLaunching (app, options);
- }
- }
+ return base.FinishedLaunching(app, options);
+ }
+ }
}
diff --git a/Meinkonrad/TINK.iOS/Device/AppInfo.cs b/Meinkonrad/TINK.iOS/Device/AppInfo.cs
index a4061d4..22cec2a 100644
--- a/Meinkonrad/TINK.iOS/Device/AppInfo.cs
+++ b/Meinkonrad/TINK.iOS/Device/AppInfo.cs
@@ -1,5 +1,5 @@
-using Foundation;
-using System;
+using System;
+using Foundation;
using TINK.iOS.Device;
using TINK.Model.Device;
using Xamarin.Forms;
diff --git a/Meinkonrad/TINK.iOS/Device/Device.cs b/Meinkonrad/TINK.iOS/Device/Device.cs
index ac2185f..a715f2b 100644
--- a/Meinkonrad/TINK.iOS/Device/Device.cs
+++ b/Meinkonrad/TINK.iOS/Device/Device.cs
@@ -24,12 +24,12 @@ namespace TINK.iOS.Device
public string Model => DeviceInfo.Model;
- public string PlatformText => DeviceInfo.Platform.ToString();
+ public DevicePlatform Platform => DeviceInfo.Platform;
public string VersionText => DeviceInfo.VersionString;
/// Gets unitque device identifier.
/// Gets the identifies specifying device.
public string Identifier
=> UIKit.UIDevice.CurrentDevice?.IdentifierForVendor?.AsString() ?? string.Empty;
- }
+ }
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs b/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
index ba8f036..c9a7998 100644
--- a/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
+++ b/Meinkonrad/TINK.iOS/Device/ExternalBrowseService.cs
@@ -1,23 +1,23 @@
-using TINK.Model.Device;
-using Xamarin.Forms;
+using Foundation;
using TINK.iOS.Device;
+using TINK.Model.Device;
using UIKit;
-using Foundation;
+using Xamarin.Forms;
[assembly: Dependency(typeof(ExternalBrowseService))]
namespace TINK.iOS.Device
{
public class ExternalBrowseService : IExternalBrowserService
{
- /// Opens an external browser.
- /// Opens an external browser.
+ ///
bluetooth-peripheral
+ UIUserInterfaceStyle
+ Light
UIDeviceFamily
1
@@ -53,8 +55,8 @@
CFBundleDisplayName
Mein konrad
CFBundleVersion
- 312
+ 337
CFBundleShortVersionString
- 3.0.312
+ 3.0.337
diff --git a/Meinkonrad/TINK.iOS/Main.cs b/Meinkonrad/TINK.iOS/Main.cs
index 9735e14..c766ee2 100644
--- a/Meinkonrad/TINK.iOS/Main.cs
+++ b/Meinkonrad/TINK.iOS/Main.cs
@@ -1,20 +1,15 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Foundation;
-using UIKit;
+using UIKit;
namespace TINK.iOS
{
- public class Application
- {
- // This is the main entry point of the application.
- static void Main(string[] args)
- {
- // if you want to use a different Application Delegate class from "AppDelegate"
- // you can specify it here.
- UIApplication.Main(args, null, "AppDelegate");
- }
- }
+ public class Application
+ {
+ // This is the main entry point of the application.
+ static void Main(string[] args)
+ {
+ // if you want to use a different Application Delegate class from "AppDelegate"
+ // you can specify it here.
+ UIApplication.Main(args, null, "AppDelegate");
+ }
+ }
}
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/01_Blue_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/01_Blue_72dpi.pdf
deleted file mode 100644
index 4193e7e..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/01_Blue_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/Contents.json
deleted file mode 100644
index fe1f2e2..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Blue.imageset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "images": [
- {
- "appearances": [],
- "idiom": "universal",
- "filename": "01_Blue_72dpi.pdf"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone",
- "subtype": "retina4"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "ipad"
- }
- ],
- "properties": {},
- "info": {
- "version": 1,
- "author": "xcode"
- }
-}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green.pdf
deleted file mode 100644
index 1a1fcc4..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green_72dpi.pdf
deleted file mode 100644
index 1a1fcc4..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/01_Green_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/Contents.json
deleted file mode 100644
index d1dcc23..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Green.imageset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "images": [
- {
- "appearances": [],
- "idiom": "universal",
- "filename": "01_Green.pdf"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone",
- "subtype": "retina4"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "ipad"
- }
- ],
- "properties": {},
- "info": {
- "version": 1,
- "author": "xcode"
- }
-}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/01_LightBlue_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/01_LightBlue_72dpi.pdf
deleted file mode 100644
index 9a10fd3..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/01_LightBlue_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/Contents.json
deleted file mode 100644
index f70c846..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_LightBlue.imageset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "images": [
- {
- "appearances": [],
- "idiom": "universal",
- "filename": "01_LightBlue_72dpi.pdf"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone",
- "subtype": "retina4"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "ipad"
- }
- ],
- "properties": {},
- "info": {
- "version": 1,
- "author": "xcode"
- }
-}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/01_Red_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/01_Red_72dpi.pdf
deleted file mode 100644
index 39f7d0a..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/01_Red_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Contents.json
deleted file mode 100644
index cc4acf6..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Contents.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
- "images": [
- {
- "appearances": [],
- "idiom": "universal",
- "filename": "01_Red_72dpi.pdf"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "universal"
- },
- {
- "appearances": [],
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "iphone",
- "subtype": "retina4"
- },
- {
- "appearances": [],
- "scale": "3x",
- "idiom": "iphone"
- },
- {
- "appearances": [],
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "1x",
- "idiom": "ipad"
- },
- {
- "appearances": [],
- "scale": "2x",
- "idiom": "ipad"
- }
- ],
- "properties": {},
- "info": {
- "version": 1,
- "author": "xcode"
- }
-}
\ No newline at end of file
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Blue_72dpi.svg
deleted file mode 100644
index 7f4e1aa..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 1
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Green_72dpi.svg
deleted file mode 100644
index ef30189..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 1
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_LightBlue_72dpi.svg
deleted file mode 100644
index 3dbc629..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 1
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Red_72dpi.svg
deleted file mode 100644
index 66321aa..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/01_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 1
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Blue_72dpi.svg
deleted file mode 100644
index 8f48fee..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 2
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Green_72dpi.svg
deleted file mode 100644
index b6d21cb..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 2
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_LightBlue_72dpi.svg
deleted file mode 100644
index 599a669..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 2
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Red_72dpi.svg
deleted file mode 100644
index c56b34d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/02_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 2
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Blue_72dpi.svg
deleted file mode 100644
index d2d3b6e..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 3
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Green_72dpi.svg
deleted file mode 100644
index fd14524..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 3
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_LightBlue_72dpi.svg
deleted file mode 100644
index 8653541..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 3
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Red_72dpi.svg
deleted file mode 100644
index 8a14056..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/03_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 3
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Blue_72dpi.svg
deleted file mode 100644
index 909cd7c..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 4
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Green_72dpi.svg
deleted file mode 100644
index 3780d3d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 4
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_LightBlue_72dpi.svg
deleted file mode 100644
index 2dd281d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 4
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Red_72dpi.svg
deleted file mode 100644
index e1ffc30..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/04_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 4
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Blue_72dpi.svg
deleted file mode 100644
index 81ab024..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 5
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Green_72dpi.svg
deleted file mode 100644
index 7a6a8eb..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 5
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_LightBlue_72dpi.svg
deleted file mode 100644
index 16405bc..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 5
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Red_72dpi.svg
deleted file mode 100644
index 71456b2..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/05_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 5
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Blue_72dpi.svg
deleted file mode 100644
index b7c6a42..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 6
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Green_72dpi.svg
deleted file mode 100644
index af1674a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 6
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_LightBlue_72dpi.svg
deleted file mode 100644
index b06c945..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 6
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Red_72dpi.svg
deleted file mode 100644
index 70bc6a1..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/06_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 6
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Blue_72dpi.svg
deleted file mode 100644
index 68db843..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 7
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Green_72dpi.svg
deleted file mode 100644
index 82ee22f..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 7
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_LightBlue_72dpi.svg
deleted file mode 100644
index 209925d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 7
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Red_72dpi.svg
deleted file mode 100644
index 5af8f25..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/07_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 7
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Blue_72dpi.svg
deleted file mode 100644
index 8978931..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 8
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Green_72dpi.svg
deleted file mode 100644
index 384d5db..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 8
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_LightBlue_72dpi.svg
deleted file mode 100644
index e22caf0..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 8
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Red_72dpi.svg
deleted file mode 100644
index f9c3023..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/08_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 8
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Blue_72dpi.svg
deleted file mode 100644
index 2d03ffa..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 9
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Green_72dpi.svg
deleted file mode 100644
index 39649ec..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 9
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_LightBlue_72dpi.svg
deleted file mode 100644
index b93317e..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 9
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Red_72dpi.svg
deleted file mode 100644
index 44305a0..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/09_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 9
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Blue_72dpi.svg
deleted file mode 100644
index 438bcfe..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 10
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Green_72dpi.svg
deleted file mode 100644
index c706252..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 11
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_LightBlue_72dpi.svg
deleted file mode 100644
index e365f1e..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 10
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Red_72dpi.svg
deleted file mode 100644
index 24b7342..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/10_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 10
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Blue_72dpi.svg
deleted file mode 100644
index 9a59fa2..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 11
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Green_72dpi.svg
deleted file mode 100644
index 6d15150..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 11
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_LightBlue_72dpi.svg
deleted file mode 100644
index 64b8c0d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 11
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Red_72dpi.svg
deleted file mode 100644
index 4ca2da5..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/11_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 11
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Blue_72dpi.svg
deleted file mode 100644
index baae6fd..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 12
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Green_72dpi.svg
deleted file mode 100644
index 82f1533..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 12
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_LightBlue_72dpi.svg
deleted file mode 100644
index 28d63ee..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 12
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Red_72dpi.svg
deleted file mode 100644
index 5fa47b5..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/12_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 12
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Blue_72dpi.svg
deleted file mode 100644
index ef210dc..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 13
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Green_72dpi.svg
deleted file mode 100644
index c449cbf..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 13
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_LightBlue_72dpi.svg
deleted file mode 100644
index 3b81336..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 13
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Red_72dpi.svg
deleted file mode 100644
index bea50cc..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/13_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 13
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Blue_72dpi.svg
deleted file mode 100644
index 31b6aab..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 14
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Green_72dpi.svg
deleted file mode 100644
index 1103510..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 14
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_LightBlue_72dpi.svg
deleted file mode 100644
index ad74cda..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 14
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Red_72dpi.svg
deleted file mode 100644
index 7449a76..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/14_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 14
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Blue_72dpi.svg
deleted file mode 100644
index 8e5aa02..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 15
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Green_72dpi.svg
deleted file mode 100644
index bb4a7db..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 15
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_LightBlue_72dpi.svg
deleted file mode 100644
index aa33746..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 15
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Red_72dpi.svg
deleted file mode 100644
index 9754aef..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/15_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 15
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Blue_72dpi.svg
deleted file mode 100644
index 38adea1..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 16
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Green_72dpi.svg
deleted file mode 100644
index 36d038a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 16
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_LightBlue_72dpi.svg
deleted file mode 100644
index 58b486e..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 16
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Red_72dpi.svg
deleted file mode 100644
index f6763b5..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/16_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 16
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.pdf
deleted file mode 100644
index 42980bf..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.svg
deleted file mode 100644
index cf7d227..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 17
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.pdf
deleted file mode 100644
index c6d123e..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.svg
deleted file mode 100644
index 15be878..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 17
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.pdf
deleted file mode 100644
index b8c495c..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.svg
deleted file mode 100644
index 242772a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 17
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.pdf
deleted file mode 100644
index 13a5cfd..0000000
Binary files a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.pdf and /dev/null differ
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.svg
deleted file mode 100644
index 0ace05a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/17_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 17
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Blue_72dpi.svg
deleted file mode 100644
index 602e3e4..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 18
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Green_72dpi.svg
deleted file mode 100644
index 8547041..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 18
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_LightBlue_72dpi.svg
deleted file mode 100644
index 6ce9899..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 18
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Red_72dpi.svg
deleted file mode 100644
index 9f0fdba..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/18_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 18
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Blue_72dpi.svg
deleted file mode 100644
index 9312bec..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 19
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Green_72dpi.svg
deleted file mode 100644
index 3520f09..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 19
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_LightBlue_72dpi.svg
deleted file mode 100644
index 6c7504c..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 19
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Red_72dpi.svg
deleted file mode 100644
index c2bcaee..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/19_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 19
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Blue_72dpi.svg
deleted file mode 100644
index 8dc8b72..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 20
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Green_72dpi.svg
deleted file mode 100644
index 537eee9..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 20
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_LightBlue_72dpi.svg
deleted file mode 100644
index 9401aae..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 20
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Red_72dpi.svg
deleted file mode 100644
index 9f0f418..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/20_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 20
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Blue_72dpi.svg
deleted file mode 100644
index 1fc8c29..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 21
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Green_72dpi.svg
deleted file mode 100644
index 74787fb..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 21
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_LightBlue_72dpi.svg
deleted file mode 100644
index 8aafdd0..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 21
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Red_72dpi.svg
deleted file mode 100644
index 1365b43..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/21_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 21
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Blue_72dpi.svg
deleted file mode 100644
index de46b8d..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 22
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Green_72dpi.svg
deleted file mode 100644
index 7d7f1ca..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 22
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_LightBlue_72dpi.svg
deleted file mode 100644
index 8a845c9..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 22
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Red_72dpi.svg
deleted file mode 100644
index 0efc1c5..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/22_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 22
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Blue_72dpi.svg
deleted file mode 100644
index 64df988..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 23
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Green_72dpi.svg
deleted file mode 100644
index 3d64d0a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 23
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_LightBlue_72dpi.svg
deleted file mode 100644
index db9e907..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 23
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Red_72dpi.svg
deleted file mode 100644
index 5198d73..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/23_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 23
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Blue_72dpi.svg
deleted file mode 100644
index 157ae76..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 24
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Green_72dpi.svg
deleted file mode 100644
index 5fe5541..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 24
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_LightBlue_72dpi.svg
deleted file mode 100644
index 0d325d5..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 24
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Red_72dpi.svg
deleted file mode 100644
index 380a8de..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/24_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 24
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Blue_72dpi.svg
deleted file mode 100644
index 5fc8be0..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 25
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Green_72dpi.svg
deleted file mode 100644
index 95eff94..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 25
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_LightBlue_72dpi.svg
deleted file mode 100644
index bed310c..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 25
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Red_72dpi.svg
deleted file mode 100644
index 55884b8..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/25_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 25
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Blue_72dpi.svg
deleted file mode 100644
index 19eed6e..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 26
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Green_72dpi.svg
deleted file mode 100644
index b54e1d6..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 26
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_LightBlue_72dpi.svg
deleted file mode 100644
index 8d9c266..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 26
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Red_72dpi.svg
deleted file mode 100644
index 1cebf78..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/26_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 26
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Blue_72dpi.svg
deleted file mode 100644
index 0df0ac3..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 27
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Green_72dpi.svg
deleted file mode 100644
index 8135650..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 27
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_LightBlue_72dpi.svg
deleted file mode 100644
index 12e0320..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 27
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Red_72dpi.svg
deleted file mode 100644
index a8117f8..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/27_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 27
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Blue_72dpi.svg
deleted file mode 100644
index 33bc15a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 28
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Green_72dpi.svg
deleted file mode 100644
index 6b6469f..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 28
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_LightBlue_72dpi.svg
deleted file mode 100644
index 21fa2f7..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 28
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Red_72dpi.svg
deleted file mode 100644
index d7cdc85..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/28_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 28
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Blue_72dpi.svg
deleted file mode 100644
index 9a8dce2..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 29
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Green_72dpi.svg
deleted file mode 100644
index 5867eb6..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 29
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_LightBlue_72dpi.svg
deleted file mode 100644
index 43cdb94..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 29
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Red_72dpi.svg
deleted file mode 100644
index ff4202b..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/29_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 29
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Blue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Blue_72dpi.svg
deleted file mode 100644
index 7da1955..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Blue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 30
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Green_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Green_72dpi.svg
deleted file mode 100644
index 3f04ee4..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Green_72dpi.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 30
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_LightBlue_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_LightBlue_72dpi.svg
deleted file mode 100644
index d984a60..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_LightBlue_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 30
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Red_72dpi.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Red_72dpi.svg
deleted file mode 100644
index a30e010..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/30_Red_72dpi.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
- 30
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/StationMarkerNoNumber.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/StationMarkerNoNumber.svg
deleted file mode 100644
index 4019519..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/StationMarkerNoNumber.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.ai b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.ai
deleted file mode 100644
index e3dc748..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.ai
+++ /dev/null
@@ -1,805 +0,0 @@
-%PDF-1.5
%
-1 0 obj
<>/OCGs[5 0 R 31 0 R]>>/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<>stream
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- TINK_Logo_KN_Final.indd
-
-
-
-
- Cyan
- Magenta
- Yellow
- Black
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-endstream
endobj
3 0 obj
<>
endobj
7 0 obj
<>/Resources<>/ExtGState<>/Properties<>>>/Thumb 37 0 R/TrimBox[0.0 0.0 841.89 595.276]/Type/Page>>
endobj
33 0 obj
<>stream
-HdWI$+ɡss :-*23.BI髹~x?ׯxQCvb^[>~C-_o '|o_/W1BhW%'MÈz r+g락>_{ݧ`c51Pß"p6.)<|]rz[,- zN{z,
w o+1$r$8Us %Ǯ=])G
-%S;V[9E1~UW֔F ß&ˆ3Z ab
-[O~3h<,| [.)gdyaw#^sͤ 1ڭa YY0wXb/S8{[O|<
-BNc%Iֵ{2QCi*8V- k`^y(|C!Fn+-u+ Eʼ+Ƞ(-D#E=+$K<ϒk X+Zzs4*l oF2_-Ě/pJ{#(؆5*A<]ET^踐ѩ5
XOtbJ~zCo"%xD'G{ĴCeLߩ-T@" NӝWf`LUrO}R0vi xh|%8 KOʶ ]NQuKiϮ1%(F.G/nQ3
1V[s.O?0veX'Jj{\Bp'UT U% SuVё=0M7|* ieSjLq<+4*,|L#tJ}"fvbi2()2BI@0ch+Qv@/ELR <^r *1D`0x ~\4`Ѐ<4` Jd:,ˢO lʡ\3PɺIyV47cȢ !o E l8,Ojsf~v&O,,l yNDaBGEE ?QQ
-:IaDN\]|V!ԉeFpv9NDJ*ߟ oX~VWRy~ݒG=1 any{X
-rKv`}eٳJ~r__^vE3|~}*O>(LGb}#ku6fs/8ཆ>bWP :]Qヷf+fByrt%D2N0Ӄ
- HLSEZFN:UJsg%i5=p ̈́A65@eyVI+3
2y!x'w6r:<z `,4v,k:qDC2 AHhgu*A}U.ko=֦%74pOOh],gvĈ(1+Yփt"9JT7L%3WTd z'BxTnflCISCD9p`0>T]>V[4j+xgKYJA_J`jP
rFcr38[ R$$^
->(Y (l=;oKٟ%FPM<|d ݷ*m8m.9Q
H@ En0 kT>: JF5+@P4sN۩x`ԠXTD5/f*?O@Uo0#Ig# BRNNq1DO[ƊGh7h~ݭSSM-6_#NUadvX JrR\ʩFPI]ݛ["% aP2:p§֝P+
-` Rk-۷`Aݚ[dЧPUt+@ Lݳhj+3 łqqΒkFW ,9s3 W.W:ZreK 4zGߩo\,
-] B}>C7c#0vaz\'ʤV\R!}Bܓ7Vz i&n9>g+[vјى#WX;A8|+?ODu19E[q(u bu萷pqK3>U!{s"Gf
9 KP,T* 4AOtBwhjiXOwɄ `4Ж@ X4(A'# ;Ί`ĉ;jj@
-t:x
- C|qhV0O4!Xdj-dН$ըlx[QGU~WȎJ\hc a; uƗ v
2i{3Li 4| QA>$rWXHJ'Jsee= `:D6kj uA1 x8njMGэz t9ⵚ KbOB 44| kh\: t| 3!eY7Q@߂
-֫SWƿpZ\旍
+ s:4be3 i~
-9:)#5Y,|j)]Bꌕ_ J/hw k" 6!WGBmSW k Y-"O^ 1vxEYZ 0^B/,fJ4SZQzy;q\dP7j*CZ;l :4}١CkP}y_lj- `m(E)d23|Ъx'T'T$nӂS8_3N]J6RE>;=+4?_\/5G~x-h }y\*:" ۷P
-&]sw|Ş1d2,Z*@o @Z
-hBЬ9
%[iqޔËyĜm*nZK{llx->ϭS f,>PԳ "f R(rIr ' y^[
- 4 xJC(̐;*}Fc'[CjZi
2UxkՀ(أ
-:eOIv/fCOXVF2Y5D-)1ŶIgE8bWrǙp`,A9C m"Ղ\GJV0*,&O#(hrug&&b'1QƓS]a&HdK"֑oi+
-5@Gē e̯.bzġ6nӞ*H'.h"[m}mbͧ-2#g*u"dyR/!VaX2,$~<
-=i A~4.u-ӄjsx mJ\`4vcZcO(:m'bynU =_5'
um Z\W EMKt<7!0H6`8)`I(A
4 ƶSݶH X?P9iH|" ;9+ggw{6Vv #u iGz ~'=0S3d~rqvq~{{cjQ ^So~ b
-cFT}*,yN}7|)5jCAi5ׇ=A e
=>]m9bLJ^5N uOqkyxE5p.FVZ=aMY|3Mƣ)Xmٮ[ A)8eIdl(CkﲇY > \ E\ŌM ^gK !̸a ݘisT䖓s/kI'lfxdUXa2EpVGk$_aF8bսr%$tmIKDBf{! ]RXtázΨЋC 5;Hi|H1)& )
AS zMFdKv2Z>2Tgf&n ucD)B!7 -uW2Fjp۪'Ǫ>stream
-8;Z]"96.p(#_pr6anNOef4chY&tgJL&WLIBo#sX]9N#]iGnL^Y
-qmUisp.7`m`YI%f:a+p2mJY5/\e`dO+?F0K0fl9>erCP(5]luiLh?&]7Da41YF(ZX
-lXtJ`dIbb"qiW-m7p`O)eQ`\;3pW!t%&D_d]>,>uj:DfAmQscHpUW<3buVAl
-pU^*q>n@&]\pGO`#c[a^QJEgLGE7bdSAFLiWePW65*pBr_)E%,XAdemO2oF)_HE3G
-2Na5n&P@2#eDTfT[BBb8!F*%ah!SI`)Y!`.En8=DO-$7[&'W*[4n]3M.UlAj*JH&/@d$lfh^(q<-:k\Nc+03a^"Kr$,Po56CoPW#uE~>
-endstream
endobj
38 0 obj
[/Indexed/DeviceRGB 255 39 0 R]
endobj
39 0 obj
<>stream
-8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0
-b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup`
-E1r!/,*0[*9.aFIR2&b-C#soRZ7Dl%MLY\.?d>Mn
-6%Q2oYfNRF$$+ON<+]RUJmC0InDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2jGn0L*c5֬U.P,XU@jtZ۾)j?
-M@Mw q*t :=^{8Ax[p/gt,?ݖzMnm f7=ӭGu# @JCL|<+i d )B5:.RGn+vvohTpJ'GrNDNۭ%_n䚇>z ڌwasE:ɚlu8& j[ IY$%85~A 1Aؓ'?ՙ?TS5!٦hr,#ʐv
-8-< \ <}O$^ d2$X&Rg;&"(nwn7Uq m#j7 o
F%0Zk+\UP/us^R`n./4~W د^r/N's@ .l\>؆ cph6 C 8)^{ v8w/ >}v x:z> T `т Y'z,MChTLj ;E/ ,xU@z"Zb`nU%.{"i( D p ӹ|`
خߋuzty
{s? d~A}[AvyVkC+cp2m~),N?:p.=q@whDu\zΕz JMPVA8E[< d,
-yS 9'ϏaLj:j 9 >84wnẃ^UUom0X>6qQ6x
-{O\7wu+tߪ =&0np0i}?ĩx7
rMNWm"gӚ E`eq3-jtnS5fڡx TP-;Z(6r:ڏ$:,75J - }~4FO~wیfq]Whz!ȧax^? wnt-đm_9LCӚ /Wm̚I 0u/YLSXmwt=@%:/ם9mz=C~
-AhC P? t<ʼ l6%bxWrHG]],|@_&7~z+ a\\qqe|>܃wqJv/ V
-D8-הdǰP1pA# dgeoU r zNU=cSL?2RgÛ!'Y؍)uʓ^ek%AK(kB1ce#A m;i5zn_(iU)a{Ϧ@i|?`II!hOOr-RRZLvSZH4 Ў3# 3j<¾PY iJ^voL\G 7# `%i&&(rC\d QVOT~66ްit'G@6Z&鉧fL.P8s-7%42Id Eh2%=+-h+ `,Sb
vbX"÷E>0sũI$U8|q2I&J&־ C%aM'm
x`q*D}nO?αF:0xk[Hhbe ڞp) >Y>( }D3p']'/~-hL#g@H84~ټ$<4UpBaa+ҍ~`;E ^$L}[R3G'= U Rh U o:]~W^~߿^OW*_۩eҺԬ"#% uYB&FQ;XY{̠jI>5CgB*zr!(&dԚHOKP;Bͣ:, O&0[ 2'թ 3Fޔ\x 1 6Hd5ȕ l|X υm_(E{* =Ϧ LrVDq<$.ҤM{,E>&@AVRٕjal\,n>Yٽz XB7 MBy`%Ngis̸BdP2]7A&+["t <Օp7
-)2b f7,v3?ʤw&lӽ+Ei͙{`Od`@ jZi(]1뽙ݮ6Uhp =^6`r.K_ cM,4 b֧fqÀ$3 [ %hyƼ
V,]ڜD !k ZK4u5M.) 4SbΖ =&fn..v8_z; ;|\F+ e& Id0`r"
-?ǖv p_ð} =q0z} }}%+
-H\6o?5 9 @n2ԄyJFi0\MiVPڷ+P=L8H&z~h
5{>_z ^?ajW4sR) _O^GtyFx\V!*:i 1 AM[JW)04w#Ѽ=4Eh0qeM DℴL_ErFSKT`F#Z历RHFYZ#Y.^8
nF)]~3>lH ^paT%FY04
ߢX/eJH¨ݳ4MSmeu^`m>![֥x]fbCEы ^8O5]83<6ͱ^,{fڴ,ۅe3v;ЖX-\ Giu|R&Zi ɂ6̝*yhC2^6Z1I[J#: _nb>C$ի)AyV w,q_PO(xS8w[e {5K0zbvY+<~Ԭvh8O$m仜Oi/L avL3L.lL D|t;hc̱XoA' 7C wh.ތ'L4+ Ê!te4<T hߞap9du) ](Ѽsg|}fwFu9Áj`E`HSKk
],23.0SO7`!ee:{EPh%6Wb fM&=}9u @تu|}R!Qt7o éL4 0y}Ӹ= Ώ&aAK4; ".G۷i8#A$V<"t !o -y鹆qoY^ۣ /*vu]`\x#;s`!b<9Ix3pB J !=XeuNZ fkk<Ӌ@wrPn0
@*lh
-,H!QIvzM6$K1'PSu ʤ< NK7_54( n%Ɖpq!iᔲקX ~]^ufVggfz~^'$ ) v"ojl.`B3b\;%v͖XoՇ7tc} _ۙQ&*8n}RxÐIU_ǝ֟e,XsV64#m3/]O 7c? 9$!FW{6l^3[T~R& cܞgb2k)eg [*j\w{{IK
#aV7| N {YNkF #҃CoI= 1X>ͦV t^Ws%Z\D$$}`;.g4U<y&p \FЗ2ٶl XNbhp,$]u+
zIz!б \ 0 #~-cVbFotr:f#UϒmB_;5 ֩y p&ުQl4h1tRb6ְe̘ ˬv`!h:L`'-ToWazZw֑[<텆} Z챲cLȪ^YX3Xxc>ӫ'6j7ˀUZo.h:UƩ]`kf 5s!ʹp:lXH,2icH*B&x&_}ݘxdkx9t G ,
Seύ˴u#=
] qp
ˏcӻ:U,RdxLڗٳ=P#=x2cߖ&w1.NCUm8쇿KNj/y.몺5<-i4#h4 dvhCIrJ/JY>}
i&
\Fqͮ,F_+ȤN4$P5`l6^jӔX¶9ʮqjN$ܚ:1e i05sL3ZVlP:0Kik?w&Vf.d \F )̫{(Bm^A
-v'Sx,DkU -kFG][Sl߶,V ?e mj[Pl͟èr3{ϰ LU0''_ɹ
-Tfzw}%狌`+{o698`*J%_v5 @ v!߮۸1du7
-z}Ԧ'cz56j=rChȅ91/Nf78(FWр\x(mI3X P_L .` +5gK{&ʎm{3v:
-t6gL\bNd7c Ckd]h{RCG^w*
袱 su^NG'Xc\%G{E& j!S?yBGIfP_ 4d;hM/Iy!dS ӃL5eZ
-H:,St ˺i![0(\n7 @j9
,9 )HV MR) JA[Us,l$ݔ
ߨJvݜm6?U *M*hzL3Y q9'/ :'9YtWN1mѩ|G ]P˽LeB2@: Guã.Mх VD^],jڤF=e$]riۤd 'B qJН^Jf_hHDt懼?>H^*f?͟;j
-YtsqڌZ [U4ٵfO $[sXyJpQ7ƌPojy C(?HB:]}כy3Ba%!pwyC%JVi%LedNғUX_|UdZ)LvLXupaPR c,dnET@J>
-9qAFG4l '`ʃ y5%vOj!1ĺѨ+HGEYYSr0ޝǂ1̔{+ o 3}0lPc$O)]1'-6|
>jڟM,#6 `0I ׄ z_+t$NڃF5 3_a N`[3lgu7d}CzR >4$ _ #0s1Wz47g4$g~ 7qu&:ҫٕpتAI'N@oc?=?Ѿixr
=nK\-Li?W~b7ѠMr:M4<#멖Ѩ!-C#| ^ C5X ST':a bDwD6W}"иQ"iݜM_Upjt G1`+ d ̖2L'2%f,RҞ&X%z|Y!x.~Oa"oӋޞ/1$8}OO9?*1n=ŋ] %a >a=X{tcN)cE]+ ܥ]qD9 *Ǘ{ϕJQĞgoca4SOsRI {- aO 3j3bvzvA&c ;~ cj}?i7L봌1H>R@)0,f|]btc!;f=hc^m&1_F0|SaGb.QN-/ч ת`>bHaXم2 la,4i"F c-aAs
-K~jXZOiL't 5XvcnZLXUcq|5e7[Xw41*aں}5=Vlܮ7^ͦ؍JM*,3`G3ZOF6.[jKW/5^ .hԞ`A3աටFauzC|?Vz2-umn MuzZ=l`CxPByz 6}_j
Jѻ_rޜpue7&ibMPxFS"j4#6MWc2hZ3(
9ol47@֓ A kՕי`MεAvCokmG-1m2E9Wܦ-[: mzh;`VsQP pY `NVYNxmucܢ 飺>k貋BW.FL uw`M^&=6 մ7{ۧUS [ƍ >mV[#Zv K~Nz>TǮ?L бlnP-3$;!_iL
^YiQ6̼]aS
UjCC4oј΄ލe#mCoF㴰/ k<&j!ANLjJQ`7eRSվ ɎkMh1 .c11+sΥ%5ndȁy ̫e|
?-&ӼoqwCK( [R_fM-;e:wo uo55 3mOkYZ+W]ɗ+mW z\l OV\v}:e^_NnI|^xm-6vRXk [9];WaTq$O< Ƹ㮖fzFpj<5Ą.o&friAGxh|NbL$w6Wm;u?˸1X]z,&]ٞu3)i .Suyݦ/WrU} \ߥ߭Tp8&-Hاwݬ=ɮ>ee>z ړM&ubLlsc5fs'rL6덡w6?gi+\vP|ΕoJ̾.6J b2DCoe1 Tb,V }{ [e fP_`\f$Є.Nf3Tp5SRh)B F' K~/$ {+b{&#Qy-&a[[ WԚ-RHj Y _6[r}}:XS~9*YG,sb
M7} WqsOOxgޙſ
E^}'&QTbj{j7+wXHvJ~|CPS"i>L'fSy:߇LȱdU+3 Y,hd=6 7A4پnRXLTTZhnc^f1L$d|+DIh.EC11h sy,T:ajxaKwD`rtHao|?: &KULʧdWs1TSux kXv3;u0 5Ս*^u}m㵾ykRjd qcP1훘gif5h4ٸe5g1hj-Z=./L
L݉g·_PhݛW,|Ut-_Z_7oO-g Ei
>6iS铘 ̟E|9 =SdG7GXߪ5J]sG^͠}K5ZaHΟ[b5qWȹ:8;f_m ; V h~_QO'?RSNR1{M
;kkα3<#c|Ӗ+f9Nror]%9a7oY-~A z/Oo+aH sy/k`$[/=vKfy] ] ]' zm Y iQjwקNK]`&W. X 4S n3G&9
-قU!NP'ܗrjXE{( EbWT缓JP]c9:n G<WRW6즮Xd@NNyУѽ)GQ+z8x~ M?m:tBfaJ% 1 \ ifӽ+ (*tjwEe}Q
-b9Q^X tS`}K4$xbXsњoFXMФR
- /(V<(ƄBqj[&;30,aSk6l"n6VSۡzh b5Ϋ\&սcB4Ԗ dzŰby}-A
1uUÚӺ00?hdגvSj Q^~b`
-WtTM+- X
-aEhΈI<[|Vv`c]g]j/:HVp?x) pA曱V?>w-/mf$+_NbXxe]ic->v((6R]t`t|$tl>+m$ 1y=0DВkWvlm(N҈a] ȀN"~˓l ˢXW `w bQ@8~ލX݁`E[W` VˍT1 z:*`aзb!jqW%;!V6 ʲ\XcXo{
-F^!-<1XjN2:}0iủ-[FJmVevoĸK ޞ'OO;ڪV⩷gd
-[_|ZğWƊ+F}
-hT6 D쳖DuFT~!׃n([!uK4L[.
|E9F%,${".⼕[._2(a5dz4~?O*p'
{/3:04]XF&4X ^ %JHv!AVYÍj\lP0eT~B ,,,Ao W\
-!_ aqw4\uf |Dc5fc
c&
-UukOpճ0_?,ZdbhAe Xø˟KNW\%&"3nvS{9?/BCw
--Uni-H/@
-А
-"l
EPp^u6\j>$ݮ/bF]иuclY(MڥҐ wyfYbHlPIJ96LUZt2|Lhr>ZK|FLyO)]|OmC?Tg{aJ ++I *0=*瓮=hb^3eދ#umY/AyhIJU<&0
-b)RS| P@)%Վ 䱕w(QYIQZc{ M&y7A*aOpէBLN6PQ$HxO:J!ߦ{y NL>l~ cvmHp/Mew'IrDbXvwǶϋX-nV@x(rTĠɸHnq̷(#+!.ϘI2wսJ?I5Y}x~}Fo\qsHA.cPYƥ
SK~ȼN 0<)(ޜ z8JMsz8
![+h_ $B VV -xPyCy_r[ ]PT]a Ψtp&Js9 )SxreJ >l_D dh#_%SH /lu{GV>=2f@q]y]\T!-W)N}2;.{h\rsؕ2Otc幕y/t 8ٕyM?GCIj>
-lP'T˼Fa<,Iʢp¾b>'湅}BAynaa&)SH?^ݿ*
-ɜsnY'T'5XaȭxJaPUߋ YyVaP橅}R V:f>9|l>!P,+%nuOhO.{ d-F=OhF >>nS
-^O {+tU |Fa |qh2t*2tĵ 88s՟T'D ,IB >۹>bmMS,COV&`OO6f[*ĶWA R& %*bp'Xı
-MuR,/ҧnܽ'_ _n@]rMJBy~ju g=+ u\MG_%{?)WAHnhs (Jl"rWgtU&:v|%ի
-,tj"08#6Q>Ѻ&Txm29',SR+[x"x|˶1TP#x+D^g.-zfT S&ZY!_r|~P|Ww,SUY< %w)K dj$SDء&Z| SLs8M"Rsw_$z/diӰ(0(Ix㰋fmw׳ \y a%F~Chn-,8;@J(d1x#~X q U0GuYlրEIi*s{5j$ ?NG{a
-1S)&{sFeM {dcE{ڗUUWpl}rY_?/BgBhW~GMA]/vG2d)"Pٛڰ6
-#
)yi2T7 䑽\NL{$Eh: b_:D>VɊR4tZ*}'{Ƴo=RVw;>( S"}2LF_
B*M İY6݇/drnau>5_-_w teX9PAsyKgJab@ՂİY&fnƽS48Ev+v/(nQ2_ul)5 {N۳?tƱOO&^v
-
i 0)#+ rn$+e+B:|'nsX^<յnK>6ƘUb[y6AZG)nrצkpD' ۵0iPNw-wvwiXEZ9mz5龃 䵔 yǵN2_pU6#ABwy2KܵkijndDWc<یiVdEF
-/~mG!#:!R> _ :O /JFn%jY[zk@o/#co &s
)TM"!QP/:*0TMfN])t HA!X,n6r//K#ry/I5E]_$*Gu N%J_du)IT:KB 0w$ 7/e>%/v|]%Jz"[x0u]u%Ɠ.+f_V8le(.o=zY![/+ِ|e/>ыuYM.ÞY-e>td*y ^s腇=T+m" _xPj % #Z)PT\x(}e #/Xz Q:иtu}H3@i*>-Isn9ϟN8ӦL;p~; #[Y,]5pcn:AT9 (bX"(~}fuj=g00k\ߞכso~\-5K};60
|obdz:۟֗ y*xqqzKV+oȮ=7"UyӫOH+ytcuyoGW>LͿiMhG WMњz6{Kl|;Vش W6]-/?Y~:Q;߫PpwDZLA8 <;5jLf]?7~l~MO ZO_ekK :XtsC %@ħ #g|Sk+ /N謆xnN$ .imK3gVv.~{0|_P!jB/<>${CigyGK}u$N}g:o_ѷ>{NusL蔟\tcduu;_L P>{mqN;{&s l!&:xr|gݛW7lec3 /LJ w&= .nMy`{~y98]HJ;ĉE R=?Zo(4
-z)ӹQ5*|,- ҽu~J;W >ܾ6--
_ <\s(Ílf ~x >>8u_?Y-/Y?xš9xGj )ݩM_&%L# ү,<}Ny
(\{pNj_;\X͠+u;i(v|Ϸ|<һ'1~ݯջ
-\B/7^@ow=>d^hY֤-ٚrrZ&h+8lSIi0F<,YSl}D<\m_ \i{?VΙ⯐ʋ>:up:MpB/ ܛqEG;K_ʹśWY,n~۽a㠝_'gfygWb<؛hkHӹ
-wl*G*zc#KW H*:Y{릞>^fb5/vܽC?V K \>|~iWoҖUU/[8>
Q> p" ߊ ioͧ ٪`[$dzx'x ETZ*vu_ 2H<vq] }"-5 pǯc)9G@n3ur[k٥koҟ^Wpí_RI/ u[ BJnK('&[M/`cTPu? RZsn6X vӪYc ݕc7G!牉 ⇚^dr>u8JI3
-jliJZ2vlۗdbjd,Ml;ړ֢akvaO Uk|W*67>NJ)xÎ/ r-=ܳCY 7?q c] }ufB
-gO9Ư P msӌ v5KW>4L5w/7 At7=}ǫnM pŔ 3Mĵ3Q:lw2pݔ ٪p(o)m =gJQzᛴ tUhm$^zjy3FX1].fy cz^UY/QYZ y|cVrm~9yn&}ok6eYၐ$Иn?|ٶWoWq.Q^H_ >_6>{=>uֽ+O+Oܚ`gFVu&L\F3ԨϼPJ`F+D6Q\ Ndl W$a
-+ _X&.O &S69>}(Jص?
-^Kv xixQW$Q zv~ҵi:4ޞN쇻s I&ƪ4V
-f #ߺy!i\dʉ.DԚDV# <; ,ݾ];*[{wI3Al?]z|l4"])]R0h k#gaiyd*]gJW:~"M>S 0n~Xqlvpuyruz՛ 7+Y`
yY{@ ۈhϺ*9AuDu~ 룸c0trA5-Ǿ_ ^ۂ:b Rꈞ> )?1 Wڮlo:=KNb-_6^tR717^6?ZFO[5pojWCӝI~l&D2!aӁ}Tukt}'`
-x}4]ͬM=R/gnk)CtWsO5BwN[w _[q
-b,hf+I;6^uLJ OUKLW"1||-+슩jNţ%
-5 6jBq \Y>6WS7uI#*f˵o: a[ğfAtlx,:x^`VdCɟm6zLϨG[_--O㫫+&; f2_ jbeb}m1זֲy;5wfm]FS`5VBӕ=CEptnBwrtnǙ6@~(ӎ7`94 R@} MӝvpIw>oHm51u9?;ŋsMvd碝Åfcrk&V^<)1 I1)s(?lRU F_5 l/)nDMhp l! 7חy< w$\!˿4xx
^H P#A[MЗ xNxജc.{H[ pyԀiᛚ Bp.
-]کY`:T1>yCt<&?E}?"g<y -N\009~4 lhyALNad$8n5'xRD?x? \㬤,&9P'RkzRg.M_k. VpuҦ!c5} vS$OigP 9rQ>"({xl&6
]QIzTp9KZz!?(^DH ȳe%A=ٞ}Nէs3Wվ;z* xaO DŽ*'tiBSmU;Nɷ9>Ty8eUE~LqJI)x8e|3)/pıs)1ʉ)<>Ty8e7 UN7N)RJw;j1)V#ɏ
-#*e6j̨XoK
6.W+jXq̏lHf夓֍__ ]D RM/__Y%]蠟gU`6 ;!:{s>&1La]OaGek
]L;\1=L͋mŐn.$r]gͼyfH2H57.yGq?@%{7]k5̱wJJ&0)H$ 5 E%ytRTp445CuY6 JeY$&+ < f$*r 23,,16Ui|{#n%k Pt 9M~T7 Q(Bnth?|e ʒҔ "(jSι 4^8I`25Ա4C>f^r N-hs<<0 iXHw.= (R v"MAA*@,ٜڎ"1RrKcaZaEJrx(2ieRIyAa"x ݨPMS&c , T 3ZC (a
-*2HBK{rH?q)`633l
76
-^uPs 4f9Sj sYgk$3ga:ыsE6p,y(ȚHⰀ5P5̅[ Y:
-nWRBT`
-=@\ B @УЖbȖ"NeU I`*eEeXAyH"*<Ux [ 1¹Aef:F| N!?kByKF.W.3X`Pj8
-mr;QWʫ%JTl"/Vٹ:Kn HTU`_J.-[!j)h6*0b ,IQ=* (6 ׆ Eq-%` `;> D
ܮ,I b2O-KS&_ Z1/$ 00hjhP gBn+ F\Fv2>oWа*{~F
-Zp@q#d*O ^`>\Jq$"lN>0R/%T{a6Km*ƪ& 6Aj+[X6Z2R܀bN++JC[wo!덳Zu "Q7+A`y>5M[SyYOP橧c d`§zaztp2ݣ0ʡ+q1bHB'1vQ
-(R Dlr`iC 'I%$F)u74 R ` B+!"6Ddlnw
GxSB9}1Y+'xd (09{K
-VXC1 u.Jy @D牨Ѻ@}q N\E[*:a^ЉJmZ!|5Jr>g;z^%x.AE."+yGEJD煶Omaf
^F ｿN!HUxF0
K-l5tM U%CŐ.x\#: Uɹ~X밠Ť8 !q w#6PA o3O{ E{:QoehEyL< z8Q ~{ļ) *
*+-ApA4aWHCwM= -@ !
=z Z@|`kڏ(N#͓ V K +&&S<֨
ѯ ч ] ]RX墬= H<:#wB)GQ>T/a(ec
-`W˺"H g (XǒT^;E!"pOv%$:i/ ʃyF 9
-t L8;J .0tQ11tEt0N
CYj@H%ƙ'E"^-&DR.@{.0A)XpWga؋H V(.lktiڐXP!Pr2=dх +$mZ#2zh%(
-Ʒ|:iZ ;̩~]% +Aɹ R P&FYacl_z!́ԟԗTDIǪ^0J # )q^]Lt B6p1bߵc:^v<As_5oP$U!\vT %A@
sg J9Q0Fی'@
-hLnhqrLQ(uR@yBL%XrQSU$lf\Ǹ7 (Uʼj da.
- JڕI;` 9qzR"I;oB vW,++Rx SP7ؗR:V,BsYB QXeXQMP]puUĒ˹\*'"B#{1qUlų{/o!5i-H 0
9Wf` = e=%ݔL AའwS1ZEQo!a7K=Avu DPX
-I !YR me Ùy',C-=" L9LWH/G9glܫ$2Nge .HԐQ )uV~#- 1H'p5~`H*\Ä l;ö`5Bf-ʖ@yfXI[͇XjB w`:)=DFCULƀtHEBpfͲ G.F}.vIh]B5 ӺLiV_,HB3)[(@
U Xk dZ1]Wp - s2B$1t<&dQZ Ozif)Qw} ~8 !BXW7
-
-ӑv
~P~ 6!
-i[Y J o
&35mϩGj6ÇGqwV °tϕ
7&Oo[UqE-Y6^JJRe9T=M>P>_ɇj!6Bͫ`QcR,vn-2
-O}!kx֓
- 9k 鄦~] ܐcHi 33)F?E
- 3?4]h6K,z z'Mg%3Y YJE"čX%?e#kT#sq $,?nR3)8]Jm( Z,k!YHؑD$LAy9NJjTBz+;q1LiVʒAAlآaå0-0eq(,Kv9֚i`bFeȫ6Jiiy VP3.3E[/֢@٬Rˌ{ePGD.=Up NkB, QGM)po[_y( Y.Tqh?c DSSXyiQh?yٺL}! '4ZzC$Tb|Vᐅ [E<4n;ꬣlU`+Sa
-\1+VLԈ =J\Ϛ>T!lxwN=#I ,s`$%G8,+,xɑ~BqٳԘBG5Ga K/ F|xUŮ d =˰M+9 G}IAlmI+''
2=|&JpOpR ݸ
2Hk\OՔmv2p4n /+~c>EO%߮KR_r0 m8T7zh-\m[E+MM!b
-sf.W3abfdB8ȅ-PyS
B*,Y- 7/2\OLqd\΄Bl;+,(z-\ 17T[$C,K7Eg72 ,P=E4d q- |3cʛH0.)v Uvh7Kp <]PI!MAOXfRv[rRTH&HVY7 ͫj])f<zpe&
Y
LAE~˰*R@p/4GEx(|L
-HS)c|jm7kfy 7` UeXuRm
[xޤux'Þ$N⭩KEhI7]ʀZ ATt4,`4"q+ ,\{M
-,B*@ G(YZfc2Lh?+1mMz
Y~c琥 Ohi&XiC4Tl]rjMNX
-]8~h2v ʰZ"iF^l&E&Re _4QDºksTd«\ {L?8$Ǐ{$ 4t OXee
-QtNJqUd|Vp*AT^R~B$%~y3JIaV$IUCx2 |"%ъATE! tv`1:I8l c
L &~N0X+&&uP1H*Ǎ!m Unѩd] BZGu@ebD9`
-`-cuQī藣YIb[ ilĬt/6Ԟ7,<F223:J't۶J
-
-'2:d^#=
-0#{ YA$hx4qmk kbccWHsB +Qi = PaT)L[ݸtj(~! |ˍ|'a V> =)"
-@ַaΙN7
- ]Zh Ky'XZ8ALJ
-a &6mvrI GFK@@~ljQ#!8de
-F&ygHXK a#u/as}Z'=J3Ctj('6Q
-' }G(iAlNnF= ȦjzQDo72nW|cKh`[m E)8/&tL3[Pu,|d!K3)f+0BAܷg=+
-()v.ד
-C㌳
-clD}b6I*[ s@'&,L|&
-[/w؊ > 6X ?u:# Hkp#}v흨m@ݶAT&Dm&oO6hwZKn dh3wl@6H}X#v)[D[aW
3w&Zb "0=P_;Q m'ÒGH`j{sDWM8 cV|\]xM?PTu/D'aa8a|o t~7!z"($͋) M7ȩs[A]G ߝ)w spϿ;{{w~W;v+WV ` #
-endstream
endobj
5 0 obj
<>
endobj
15 0 obj
[/View/Design]
endobj
16 0 obj
<>>>
endobj
32 0 obj
[31 0 R]
endobj
47 0 obj
<>
endobj
xref
-0 48
-0000000004 65535 f
-0000000016 00000 n
-0000000159 00000 n
-0000045495 00000 n
-0000000000 00000 f
-0000114145 00000 n
-0000000000 00000 f
-0000045546 00000 n
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000114215 00000 n
-0000114246 00000 n
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000000000 00000 f
-0000054125 00000 n
-0000114331 00000 n
-0000045946 00000 n
-0000057109 00000 n
-0000054425 00000 n
-0000054312 00000 n
-0000052704 00000 n
-0000053563 00000 n
-0000053611 00000 n
-0000054196 00000 n
-0000054227 00000 n
-0000054460 00000 n
-0000057183 00000 n
-0000057357 00000 n
-0000058796 00000 n
-0000074474 00000 n
-0000114356 00000 n
-trailer
-<<3F9A9DF9C87EE64F802E5F8FAF94878D>]>>
-startxref
-114636
-%%EOF
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.svg b/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.svg
deleted file mode 100644
index e0ee01a..0000000
--- a/Meinkonrad/TINK.iOS/Media.xcassets/01_Red.imageset/Graphics/TINK_Logo_KN.svg
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-image/svg+xml
+
+
+
+
+
+
+
+
+
+
+
+
+ ?
+
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json
new file mode 100644
index 0000000..4435375
--- /dev/null
+++ b/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/Contents.json
@@ -0,0 +1,393 @@
+{
+ "images" : [
+ {
+ "filename" : "bike_Cargo_Pedelec_Two.svg",
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "universal",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "3x"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "1x",
+ "subtype" : "retina4"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "subtype" : "retina4"
+ },
+ {
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "subtype" : "retina4"
+ },
+ {
+ "idiom" : "ipad"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "ipad"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "ipad"
+ },
+ {
+ "idiom" : "ipad",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "ipad",
+ "scale" : "1x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "ipad",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "ipad",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "ipad",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "ipad",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "light"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "idiom" : "car",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg b/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg
new file mode 100644
index 0000000..7575eb5
--- /dev/null
+++ b/Meinkonrad/TINK.iOS/Media.xcassets/bike_Cargo_Pedelec_Two.imageset/bike_Cargo_Pedelec_Two.svg
@@ -0,0 +1 @@
+
+
+
+
+ None
true
Automatic
- Apple Development: Oliver Hauff (947JH7MS9L)
+ Apple Development: Oliver Hauff (947JH7MS9L)
none
@@ -110,10 +110,16 @@
+
+ 4.0
+ en
+ true
+ true
+
1.6.3
@@ -129,10 +135,10 @@
6.3.0.19
- 2.10.0
+ 2.11.0
- 2.0.1
+ 2.0.4
- 1.7.2
+ 1.7.3
3.3.0
@@ -201,19 +207,19 @@
- 0.7.104
+ 0.7.124
- 0.7.104
+ 0.7.124
- 0.7.104
+ 0.7.124
- 0.7.104
+ 0.7.124
- 5.0.0.2401
+ 5.0.0.2515
@@ -286,1138 +292,160 @@
false
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
- false
-
-
+
false
false
-
- false
-
-
- false
-
-
- false
-
-
+
false
false
+
+ false
+
false
-
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
+ false
+
+
false
@@ -1474,151 +502,51 @@
false
-
- false
-
false
-
- false
-
-
+
false
-
+
\ No newline at end of file
diff --git a/Meinkonrad/TINK/App.xaml b/Meinkonrad/TINK/App.xaml
index 9dadb28..eecbb73 100644
--- a/Meinkonrad/TINK/App.xaml
+++ b/Meinkonrad/TINK/App.xaml
@@ -2,7 +2,9 @@
+ x:Class="TINK.App"
+ xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
+ ios:Application.EnableAccessibilityScalingForNamedFontSizes="false">
@@ -11,9 +13,13 @@
-
-
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index 07a3493..44126c5 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -1,25 +1,26 @@
using System;
-using Xamarin.Forms.Xaml;
-using TINK.Model;
-using TINK.Model.Connector;
-using TINK.Model.User.Account;
-using Xamarin.Forms;
-using Serilog;
-using Serilog.Core;
using System.Collections.Generic;
-using Serilog.Events;
-using TINK.Model.Logging;
-using TINK.Model.Device;
+using System.Globalization;
using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
using MonkeyCache.FileStore;
using Plugin.Connectivity;
-using System.Threading;
+using Serilog;
+using Serilog.Core;
+using Serilog.Events;
+using TINK.Model;
+using TINK.Model.Connector;
+using TINK.Model.Device;
+using TINK.Model.Logging;
using TINK.Model.Settings;
+using TINK.Model.User.Account;
+using TINK.Services;
using TINK.Services.BluetoothLock.Crypto;
using TINK.Services.Geolocation;
-using TINK.Services;
-using System.Threading.Tasks;
using TINK.Services.Permissions;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
#if ARENDI
using Arendi.BleLibrary.Local;
#endif
@@ -48,20 +49,18 @@ namespace TINK
// Root model already exists, nothing to do.
return m_oModelRoot;
}
-
+
// Get folder where to read settings from
var specialFolders = DependencyService.Get();
var internalPersonalDir = specialFolders.GetInternalPersonalDir();
-
+
// Delete attachtment from previous session.
DeleteAttachment(internalPersonalDir);
// Setup logger using default settings.
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.ControlledBy(new LoggingLevelSwitch { MinimumLevel = Model.Settings.Settings.DEFAULTLOGGINLEVEL })
- .WriteTo.Debug()
- .WriteTo.File(internalPersonalDir, Model.Logging.RollingInterval.Session)
- .CreateLogger();
+ TinkApp.SetupLogging(
+ new LoggingLevelSwitch(Model.Settings.Settings.DEFAULTLOGGINLEVEL),
+ internalPersonalDir);
// Subscribe to any unhandled/ unobserved exceptions.
AppDomain.CurrentDomain.UnhandledException += (sender, unobservedTaskExceptionEventArgs) => { Log.Fatal("Unobserved task exception: {Exception}", unobservedTaskExceptionEventArgs.ExceptionObject); };
@@ -96,7 +95,7 @@ namespace TINK
Xamarin.Forms.GoogleMaps.MapSpan.FromCenterAndRadius(new Xamarin.Forms.GoogleMaps.Position(47.680, 9.180), Xamarin.Forms.GoogleMaps.Distance.FromKilometers(2.9)),
JsonSettingsDictionary.GetLogToExternalFolder(settingsJSON),
JsonSettingsDictionary.GetIsSiteCachingOn(settingsJSON),
- JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.Konrad).FullName);
+ JsonSettingsDictionary.GetActiveTheme(settingsJSON) ?? typeof(Themes.Konrad).Name);
}
catch (Exception exception)
{
@@ -104,7 +103,7 @@ namespace TINK
settings = new Model.Settings.Settings();
}
- if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
+ if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
|| settings.LogToExternalFolder)
{
// Eigher
@@ -113,11 +112,11 @@ namespace TINK
// Need to reconfigure.
Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.ControlledBy(new LoggingLevelSwitch(settings.MinimumLogEventLevel))
- .WriteTo.Debug()
- .WriteTo.File(!settings.LogToExternalFolder ? internalPersonalDir : specialFolders.GetExternalFilesDir(), Model.Logging.RollingInterval.Session)
- .CreateLogger();
+ TinkApp.SetupLogging(
+ new LoggingLevelSwitch(settings.MinimumLogEventLevel),
+ !settings.LogToExternalFolder
+ ? internalPersonalDir
+ : specialFolders.GetExternalFilesDir());
}
// Get auth cookie
@@ -141,7 +140,7 @@ namespace TINK
var appInfoService = DependencyService.Get();
- const string MERCHANTID = "23456789";
+ const string MERCHANTID = "0000000000";
// Create new app instnace.
Log.Debug("Constructing main model...");
@@ -149,7 +148,14 @@ namespace TINK
settings,
store, // Manages user account
isConnectedFunc: () => CrossConnectivity.Current.IsConnected,
- connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(isConnected, activeUri, new Repository.AppContextInfo(MERCHANTID, "Meinkonrad", appInfoService.Version), sessionCookie, mail, expiresAfter),
+ connectorFactory: (isConnected, activeUri, sessionCookie, mail, expiresAfter) => ConnectorFactory.Create(
+ isConnected,
+ activeUri,
+ new Repository.AppContextInfo(MERCHANTID, AppFlavor.MeinKonrad.GetDisplayName().Replace(" ", ""), appInfoService.Version),
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
+ sessionCookie,
+ mail,
+ expiresAfter),
merchantId: MERCHANTID,
bluetoothService: BluetoothService, /* locksService */
locationPermissionsService: PermissionsService,
@@ -158,7 +164,8 @@ namespace TINK
device: DependencyService.Get(),
specialFolder: specialFolders,
cipher: new Cipher(),
-arendiCentral:
+ new TINK.Services.ThemeNS.Theme(Application.Current.Resources.MergedDictionaries),
+ arendiCentral:
#if ARENDI
DependencyService.Get(),
#else
@@ -167,7 +174,8 @@ arendiCentral:
postAction: (d, obj) => context.Post(d, obj),
currentVersion: appInfoService.Version,
lastVersion: lastVersion,
- whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion());
+ whatsNewShownInVersion: JsonSettingsDictionary.GetWhatsNew(settingsJSON) ?? settingsJSON.GetAppVersion(),
+ appFlavor: AppFlavor.MeinKonrad);
Log.Debug("Main model successfully constructed.");
return m_oModelRoot;
@@ -222,11 +230,9 @@ arendiCentral:
.Concat(System.IO.File.ReadLines(name).ToArray())));
// Resume logging
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.ControlledBy(new LoggingLevelSwitch { MinimumLevel = ModelRoot.Level.MinimumLevel })
- .WriteTo.Debug()
- .WriteTo.File(ModelRoot.LogFileParentFolder, Model.Logging.RollingInterval.Session)
- .CreateLogger();
+ TinkApp.SetupLogging(
+ ModelRoot.Level,
+ ModelRoot.LogFileParentFolder);
return fullLogFileName;
}
@@ -255,11 +261,9 @@ arendiCentral:
{
DeleteAttachment();
- Log.Logger = new LoggerConfiguration()
- .MinimumLevel.ControlledBy(new LoggingLevelSwitch { MinimumLevel = ModelRoot.Level.MinimumLevel })
- .WriteTo.Debug()
- .WriteTo.File(ModelRoot.LogFileParentFolder, Model.Logging.RollingInterval.Session)
- .CreateLogger();
+ TinkApp.SetupLogging(
+ ModelRoot.Level,
+ ModelRoot.LogFileParentFolder);
}
///
/// Service container to manage geolocation services.
///
- public static IServicesContainer LocationServicesContainer { get; }
- = new ServicesContainerMutable(
- new HashSet {
- new LastKnownGeolocationService(DependencyService.Get()),
+ public static IServicesContainer LocationServicesContainer { get; }
+ = new ServicesContainerMutableT(
+ new HashSet {
+ new LastKnownGeolocationService(DependencyService.Get()),
new SimulatedGeolocationService(DependencyService.Get()),
new GeolocationAccuracyMediumService(DependencyService.Get()),
new GeolocationAccuracyHighService(DependencyService.Get()),
diff --git a/Meinkonrad/TINK/BackdoorMethodHelpers.cs b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
index 1e09835..068f5ac 100644
--- a/Meinkonrad/TINK/BackdoorMethodHelpers.cs
+++ b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
@@ -7,7 +7,7 @@ namespace TINK
{
public static class BackdoorMethodHelpers
{
- public static void DoTapPage(string stationId )
+ public static void DoTapPage(string stationId)
{
Serilog.Log.Information($"Request via backdoor to tap station {stationId}.");
var currentPage = GetCurrentPage();
@@ -19,7 +19,7 @@ namespace TINK
}
Serilog.Log.Information($"Invoking member to tap.");
- mapPageViewModel?.OnStationClicked(stationId);
+ mapPageViewModel?.OnStationClicked(stationId);
}
/// Gets the current page assumed that app is master detail page.
diff --git a/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html b/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html
index 6c5e7aa..4118ff2 100644
--- a/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html
+++ b/Meinkonrad/TINK/HtmlResouces/V02/InfoLicenses.html
@@ -23,7 +23,7 @@
CURRENT_VERSION_TINKAPP .
Entwickler
- Verwendete Bibliotheken
@@ -537,7 +537,7 @@
The MIT License (MIT)
- Copyright (c) 2016 James Montemagno / Refractored LLC
+ Copyright (c) 2016 James Montemagno / Refractored LLC
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
@@ -571,7 +571,7 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
-
+
+
+
@@ -17,7 +24,8 @@
diff --git a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
index aeafabe..4216b3e 100644
--- a/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Account/AccountPage.xaml.cs
@@ -8,6 +8,7 @@ using TINK.View.MasterDetail;
using System;
using TINK.Model.Device;
using TINK.ViewModel.Account;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
namespace TINK.View.Account
{
@@ -149,7 +150,7 @@ namespace TINK.View.Account
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
index acba893..958671f 100644
--- a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
+++ b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
@@ -5,6 +5,7 @@
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:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
mc:Ignorable="d"
x:Class="TINK.View.Bike.ILockItBike">
@@ -13,18 +14,53 @@
-
-
+
+
+
+
+
+
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -60,27 +89,6 @@
-
-
-
-
-
-
-
-
diff --git a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
index fc4f7f5..3cd71c2 100644
--- a/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs
@@ -1,7 +1,7 @@
+using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
-using TINK.Model.Bike.BluetoothLock;
namespace TINK.View.BikesAtStation
{
@@ -23,6 +23,7 @@ namespace TINK.View.BikesAtStation
using TINK.ViewModel.BikesAtStation;
using TINK.ViewModel.Bikes;
using Xamarin.CommunityToolkit.Extensions;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
[XamlCompilation(XamlCompilationOptions.Compile)]
#if USEFLYOUT
@@ -68,7 +69,7 @@ namespace TINK.View.BikesAtStation
{
// Don't repeat the initialization if it has been completed already.
if (isInitializationStarted) return;
- isInitializationStarted = true;
+ isInitializationStarted = true;
if (m_oViewModel != null)
{
@@ -242,7 +243,7 @@ namespace TINK.View.BikesAtStation
/// Displays user feedback popup.
/// User feedback.
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
index 44c8594..9b36c89 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
@@ -3,8 +3,14 @@
xmlns:conv="clr-namespace:TINK.View"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- x:Class="TINK.View.Contact.ContactPage"
- Title="{x:Static resources:AppResources.MarkingContactPageTitle}">
+ x:Class="TINK.View.Contact.ContactPage">
+
+
+
+
-
@@ -36,7 +42,7 @@
HorizontalOptions="Center"
FontAttributes="Bold"
Text="{Binding ProviderNameText}"/>
-
+
+
+
+
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
index b928b8c..fcaf867 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
@@ -1,6 +1,7 @@
using Serilog;
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
#if USEFLYOUT
using TINK.View.MasterDetail;
@@ -119,7 +120,7 @@ namespace TINK.View.Contact
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
#if USEFLYOUT
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
index f361c49..cdf0fff 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml
@@ -4,8 +4,14 @@
xmlns:maps="clr-namespace:Xamarin.Forms.GoogleMaps;assembly=Xamarin.Forms.GoogleMaps"
xmlns:bindings="clr-namespace:Xamarin.Forms.GoogleMaps.Bindings;assembly=Xamarin.Forms.GoogleMaps.Bindings"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
- x:Class="TINK.View.Contact.SelectStationPage"
- Title="{x:Static resources:AppResources.MarkingSelectStationPage}">
+ x:Class="TINK.View.Contact.SelectStationPage">
+
+
+
+
diff --git a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
index a314144..3ca5bd3 100644
--- a/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/SelectStationPage.xaml.cs
@@ -9,6 +9,7 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Contact
{
using Serilog;
+ using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.ViewModel.Contact;
[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -114,7 +115,7 @@ namespace TINK.View.Contact
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
#if USEFLYOUT
diff --git a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
index cce7d96..f43129a 100644
--- a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
+++ b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
index c881d9b..7469312 100644
--- a/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/ManageAccountPage.xaml.cs
@@ -1,4 +1,5 @@
-using Serilog;
+using System.Globalization;
+using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.Login;
using Xamarin.Forms;
@@ -7,11 +8,11 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.CopriWebView
{
[XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class ManageAccountPage : ContentPage
- {
- public ManageAccountPage ()
- {
- InitializeComponent ();
+ public partial class ManageAccountPage : ContentPage
+ {
+ public ManageAccountPage()
+ {
+ InitializeComponent();
ManageAccount.Navigating += (sender, ev) =>
{
@@ -51,6 +52,7 @@ namespace TINK.View.CopriWebView
ManageAccount.BindingContext = new ManageAccountViewModel(
App.ModelRoot.ActiveUser.SessionCookie,
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
}
diff --git a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml
index 859f2f2..e8f2ed5 100644
--- a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml
+++ b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
index a31f44e..666b74c 100644
--- a/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/PasswordForgottenPage.xaml.cs
@@ -1,4 +1,5 @@
+using System.Globalization;
using Serilog;
using TINK.ViewModel.CopriWebView;
using Xamarin.Forms;
@@ -43,6 +44,7 @@ namespace TINK.View.CopriWebView
PasswordForgottenWebView.BindingContext = new PasswordForgottonViewModel(
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
}
diff --git a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml
index 613911b..8a8da80 100644
--- a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml
+++ b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml
@@ -1,7 +1,18 @@
+
+
+
+
+
+
diff --git a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
index ddf23c1..6d5fd7b 100644
--- a/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
+++ b/Meinkonrad/TINK/View/CopriWebView/RegisterPage.xaml.cs
@@ -1,4 +1,5 @@
+using System.Globalization;
using Serilog;
using TINK.Model.Device;
using TINK.ViewModel.CopriWebView;
@@ -46,6 +47,7 @@ namespace TINK.View.CopriWebView
RegisterView.BindingContext = new RegisterPageViewModel(
Model.TinkApp.MerchantId,
+ CultureInfo.CurrentUICulture.TwoLetterISOLanguageName,
App.ModelRoot.NextActiveUri.Host);
}
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml b/Meinkonrad/TINK/View/FeedbackPopup.xaml
index ccbfdff..a2697c8 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml
@@ -4,7 +4,9 @@
xmlns:xct="http://xamarin.com/schemas/2020/toolkit"
xmlns:local="clr-namespace:TINK.View"
x:TypeArguments="local:FeedbackPopup+Result"
- x:Class="TINK.View.FeedbackPopup">
+ xmlns:sharedGui="clr-namespace:ShareeSharedGuiLib.View"
+ xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
+ x:Class="TINK.View.FeedbackPopup">
@@ -19,25 +21,28 @@
-
-
+
-
-
-
+
+
+
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
index d8c73aa..7292eea 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
@@ -1,4 +1,5 @@
using System;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using Xamarin.CommunityToolkit.UI.Views;
using Xamarin.Forms.Xaml;
@@ -8,22 +9,42 @@ namespace TINK.View
public partial class FeedbackPopup : Popup
{
/// Constructs user feedback popup.
+ ///
+ /// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+ ///
+ public int? CurrentChargeBars { get; set; }
+
///
/// Holds whether bike is broken or not.
///
diff --git a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
index 860ff65..7dac3ef 100644
--- a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
+++ b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml
@@ -3,6 +3,13 @@
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:resources="clr-namespace:TINK.MultilingualResources;assembly=TINKLib"
x:Class="TINK.View.Contact.FeesAndBikesPage">
+
+
+
+
diff --git a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
index 547ef95..7379ff7 100644
--- a/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
+++ b/Meinkonrad/TINK/View/FeesAndBikes/FeesAndBikesPage.xaml.cs
@@ -1,7 +1,7 @@
using TINK.ViewModel;
+using TINK.ViewModel.Contact;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
-using TINK.ViewModel.Contact;
namespace TINK.View.Contact
{
@@ -10,7 +10,7 @@ namespace TINK.View.Contact
{
public FeesAndBikesPageViewModel ViewModel { get; }
- public FeesAndBikesPage ()
+ public FeesAndBikesPage()
{
InitializeComponent();
@@ -26,7 +26,7 @@ namespace TINK.View.Contact
InfoRentBikeWebView.Navigating += ViewModelHelper.OnNavigating;
/// Info about types of bikes.
- InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
+ InfoTypesOfBikesWebView.Navigating += ViewModelHelper.OnNavigating;
}
/// Called when page is shown.
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
index d34d919..bfc48b8 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml
@@ -2,7 +2,15 @@
+
+
+
+
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
index b6e8b6d..5ae38c4 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -1,7 +1,8 @@
-using Serilog;
-using System;
+using System;
using System.Threading;
using System.Threading.Tasks;
+using Serilog;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
using TINK.Model.Device;
using TINK.ViewModel.FindBike;
using Xamarin.CommunityToolkit.Extensions;
@@ -10,13 +11,13 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.FindBike
{
- [XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class FindBikePage : ContentPage, IViewService
- {
+ [XamlCompilation(XamlCompilationOptions.Compile)]
+ public partial class FindBikePage : ContentPage, IViewService
+ {
/// Refernce to view model.
FindBikePageViewModel m_oViewModel = null;
- public FindBikePage () { }
+ public FindBikePage() { }
///
/// Invoked when page is shown.
@@ -141,7 +142,7 @@ namespace TINK.View.FindBike
#if USCSHARP9
public async Task DisplayUserFeedbackPopup() => await Navigation.ShowPopupAsync(new FeedbackPopup());
#else
- public async Task DisplayUserFeedbackPopup(string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(co2Saving));
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync(new FeedbackPopup(battery, co2Saving));
#endif
}
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
index 0291304..8aa6c88 100644
--- a/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
+using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
#if USEFLYOUT
using TINK.View.MasterDetail;
#endif
@@ -17,9 +18,9 @@ namespace TINK.View.Info.BikeInfo
public partial class BikeInfoCarouselPage : CarouselPage, IViewService
#endif
{
- public BikeInfoCarouselPage ()
- {
- InitializeComponent ();
+ public BikeInfoCarouselPage()
+ {
+ InitializeComponent();
ItemsSource = new BikeInfoViewModel(
resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
@@ -122,7 +123,7 @@ namespace TINK.View.Info.BikeInfo
#if USCSHARP9
public Task DisplayUserFeedbackPopup() => throw new NotSupportedException();
#else
- public Task DisplayUserFeedbackPopup(string co2Saving = null) => throw new NotSupportedException();
+ public async Task DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
\ No newline at end of file
diff --git a/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml b/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml
index ca20553..948d814 100644
--- a/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml
+++ b/Meinkonrad/TINK/View/Info/InfoTabbedPage.xaml
@@ -1,8 +1,16 @@