From 47c03f43fba5af2fc29cd87e06148d4ad6c9b03c Mon Sep 17 00:00:00 2001
From: Oliver Hauff <ochauu@hotmail.com>
Date: Mon, 17 Oct 2022 18:45:38 +0200
Subject: [PATCH] Version 3.0.346

---
 .../Properties/AndroidManifest.xml            |  2 +-
 LastenradBayern/TINK.iOS/Info.plist           |  4 +-
 LastenradBayern/TINK/App.xaml.cs              | 11 ++-
 .../TINK/View/FindBike/FindBikePage.xaml.cs   | 38 ++++++++-
 LastenradBayern/TINK/View/Map/MapPage.xaml.cs |  6 +-
 .../TINK/View/Settings/SettingsPage.xaml      | 20 +++--
 .../Properties/AndroidManifest.xml            |  2 +-
 Meinkonrad/TINK.iOS/Info.plist                |  4 +-
 Meinkonrad/TINK/App.xaml.cs                   | 14 ++--
 .../TINK/View/FindBike/FindBikePage.xaml.cs   | 38 ++++++++-
 Meinkonrad/TINK/View/Map/MapPage.xaml.cs      |  6 +-
 .../TINK/View/Settings/SettingsPage.xaml      | 20 +++--
 .../Properties/AndroidManifest.xml            |  2 +-
 TINK/TINK.iOS/Info.plist                      |  4 +-
 TINK/TINK/App.xaml.cs                         | 17 +++-
 TINK/TINK/View/FindBike/FindBikePage.xaml.cs  | 40 ++++++++-
 TINK/TINK/View/Map/MapPage.xaml.cs            |  6 +-
 TINK/TINK/View/Settings/SettingsPage.xaml     | 16 +++-
 TINK/TINK/View/ViewTypesTypeProvider.cs       |  6 +-
 TINKLib/Model/ITinkApp.cs                     | 13 +--
 TINKLib/Model/Settings/IStartupSettings.cs    |  9 ++
 .../Model/Settings/JsonSettingsDictionary.cs  | 35 +++++++-
 TINKLib/Model/Settings/Settings.cs            |  8 +-
 TINKLib/Model/Settings/StartupSettings.cs     | 11 +++
 TINKLib/Model/TinkApp.cs                      | 20 ++++-
 TINKLib/Model/WhatsNew.cs                     | 12 ++-
 .../AppResources.Designer.cs                  | 33 ++++++++
 .../AppResources.de.resx                      | 15 ++++
 .../MultilingualResources/AppResources.resx   | 17 +++-
 TINKLib/MultilingualResources/TINKLib.de.xlf  | 24 ++++++
 TINKLib/ViewModel/Bikes/BikesViewModel.cs     | 27 ++++--
 .../FindBike/FindBikePageViewModel.cs         | 82 +++++++++++++++++--
 TINKLib/ViewModel/Map/MapPageViewModel.cs     |  4 +-
 TINKLib/ViewModel/Settings/PickerViewModel.cs | 18 ++++
 .../ViewModel/Settings/ServicesViewModel.cs   |  2 +-
 .../Settings/SettingsPageViewModel.cs         | 15 +++-
 TINKLib/ViewTypes.cs                          |  5 +-
 .../Settings/TestJsonSettingsDictionary.cs    | 28 ++++++-
 .../TestBikesAtStationPageViewModel.cs        | 42 ++++++----
 .../Account/TestAccountPageViewModel.cs       |  8 +-
 .../ViewModel/Map/TestMapPageViewModel.cs     | 22 +++--
 .../ViewModel/TestMyBikesPageViewModel.cs     | 12 ++-
 .../UseCases/SelectStation/TestTinkApp.cs     |  8 +-
 43 files changed, 609 insertions(+), 117 deletions(-)
 create mode 100644 TINKLib/Model/Settings/IStartupSettings.cs
 create mode 100644 TINKLib/Model/Settings/StartupSettings.cs
 create mode 100644 TINKLib/ViewModel/Settings/PickerViewModel.cs

diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 296b0fd..ba09c9d 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.345" android:versionCode="345">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.346" android:versionCode="346">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index c55a260..e1d0af6 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>345</string>
+	<string>346</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.345</string>
+	<string>3.0.346</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs
index a9dd07a..19ab9ee 100644
--- a/LastenradBayern/TINK/App.xaml.cs
+++ b/LastenradBayern/TINK/App.xaml.cs
@@ -20,6 +20,7 @@ using TINK.Services;
 using TINK.Services.BluetoothLock.Crypto;
 using TINK.Services.Geolocation;
 using TINK.Services.Permissions;
+using TINK.View;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 #if ARENDI
@@ -84,6 +85,7 @@ namespace TINK
 					settings = new Model.Settings.Settings(
 						null,  // Turn off filtering for LastenradBayern- context
 						null,  // Turn off filtering for LastenradBayern- context
+						JsonSettingsDictionary.GetStartupSettings(settingsJSON) ?? new StartupSettings(),
 						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
 						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
 						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
@@ -197,11 +199,12 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-			// Use shell.
-			MainPage = ModelRoot.WhatsNew.IsShowRequired
-			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			// Check which page to show first.
+			var mainPage = new View.RootShell.AppShell();
 
+			MainPage = ModelRoot.WhatsNew.IsShowRequired
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = mainPage) // Show whats new info.
+				: (Page)mainPage; // Just start sharee- app
 #endif
 		}
 
diff --git a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
index f6aa134..2d4db6c 100644
--- a/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/LastenradBayern/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
@@ -18,6 +18,11 @@ namespace TINK.View.FindBike
 		/// <summary> Refernce to view model. </summary>
 		FindBikePageViewModel m_oViewModel = null;
 
+		/// <summary>
+		/// Holds a value indicating whether page already subscribed to shell item changes or not.
+		/// </summary>
+		private bool _IsShellItemChangedReceived = false;
+
 		public FindBikePage() { }
 
 		/// <summary>
@@ -76,6 +81,35 @@ namespace TINK.View.FindBike
 			await m_oViewModel.OnAppearing();
 		}
 
+		/// <summary>
+		/// Invoked when page is disappearing to
+		/// - stop the update process
+		/// - to subscribe to events.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (!_IsShellItemChangedReceived && Shell.Current != null)
+			{
+				// Subscribe to events.
+				// Do not do this on startup because Shell.Current is null, if FindeBikePage is startup page.
+				Shell.Current.Navigated += (sender, e) =>
+				{
+					if (e.Source != ShellNavigationSource.ShellItemChanged)
+					{
+						// Nothing to do.
+						return;
+					}
+
+					// Reset previous user input after switch of pages to allow user to select a differnt bike if one has been selected before.
+					m_oViewModel.BikeIdUserInput = String.Empty;
+				};
+
+			}
+
+			_IsShellItemChangedReceived = true;
+
+			await (m_oViewModel?.OnDisappearing() ?? Task.CompletedTask);
+		}
 
 		/// <summary>
 		/// Displays alert message.
@@ -149,4 +183,4 @@ namespace TINK.View.FindBike
 		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 	}
-}
\ 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 5f147bf..1663f17 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
@@ -267,7 +267,7 @@ namespace TINK.View.Map
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
 		/// </summary>
-		protected override async void OnDisappearing()
+		protected async override void OnDisappearing()
 		{
 			if (MapPageViewModel != null)
 			{
@@ -278,4 +278,4 @@ namespace TINK.View.Map
 			base.OnDisappearing();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml
index 0bd9a2b..de8c8fd 100644
--- a/LastenradBayern/TINK/View/Settings/SettingsPage.xaml
+++ b/LastenradBayern/TINK/View/Settings/SettingsPage.xaml
@@ -59,11 +59,21 @@
                             </ListView>
                         </StackLayout>
                     </Frame>
-                    <Frame 
+					<!-- Picker to selct startup page -->
+					<Frame IsVisible="False">
+						<StackLayout>
+							<Label Text="{x:Static resources:AppResources.MarkingStartupPage}"/>
+							<Picker
+                                ItemsSource="{Binding StartupSettings.ServicesTextList}"
+                                SelectedItem="{Binding StartupSettings.ActiveText}"/>
+						</StackLayout>
+					</Frame>
+					<!-- Themes -->
+					<Frame 
                         IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
-                        <StackLayout>
-                            <!-- Themes -->
-                            <Label
+						<StackLayout>
+
+							<Label
                                 IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
                                 Text="Theme"/>
                             <Picker
@@ -235,4 +245,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index f9dbebd..5f28e71 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.345" android:versionCode="345">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.346" android:versionCode="346">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 84d9c53..0b50689 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>345</string>
+	<string>346</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.345</string>
+	<string>3.0.346</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index f3fdaaf..f48eb27 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -19,6 +19,7 @@ using TINK.Services;
 using TINK.Services.BluetoothLock.Crypto;
 using TINK.Services.Geolocation;
 using TINK.Services.Permissions;
+using TINK.View;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 #if ARENDI
@@ -83,6 +84,7 @@ namespace TINK
 					settings = new Model.Settings.Settings(
 						JsonSettingsDictionary.GetGroupFilterMapPage(settingsJSON) ?? GroupFilterHelper.GetMapPageFilterDefaults, // Activate map filtering for meinkonrad
 						JsonSettingsDictionary.GetGoupFilterSettings(settingsJSON) ?? GroupFilterHelper.GetSettingsFilterDefaults,// Activate map filtering for meinkonrad
+						JsonSettingsDictionary.GetStartupSettings(settingsJSON) ?? new StartupSettings(),
 						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
 						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
 						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
@@ -195,12 +197,12 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-			// Use shell.
-			//MainPage = new TINK.View.Welcome.WelcomePage();
-			MainPage = ModelRoot.WhatsNew.IsShowRequired
-			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			// Check which page to show first.
+			var mainPage = new View.RootShell.AppShell();
 
+			MainPage = ModelRoot.WhatsNew.IsShowRequired
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = mainPage) // Show whats new info.
+				: (Page)mainPage; // Just start sharee- app
 #endif
 		}
 
diff --git a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
index 1b8d527..ec5bb8d 100644
--- a/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/Meinkonrad/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
@@ -17,6 +17,11 @@ namespace TINK.View.FindBike
 		/// <summary> Refernce to view model. </summary>
 		FindBikePageViewModel m_oViewModel = null;
 
+		/// <summary>
+		/// Holds a value indicating whether page already subscribed to shell item changes or not.
+		/// </summary>
+		private bool _IsShellItemChangedReceived = false;
+
 		public FindBikePage() { }
 
 		/// <summary>
@@ -75,6 +80,35 @@ namespace TINK.View.FindBike
 			await m_oViewModel.OnAppearing();
 		}
 
+		/// <summary>
+		/// Invoked when page is disappearing to
+		/// - stop the update process
+		/// - to subscribe to events.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (!_IsShellItemChangedReceived && Shell.Current != null)
+			{
+				// Subscribe to events.
+				// Do not do this on startup because Shell.Current is null, if FindeBikePage is startup page.
+				Shell.Current.Navigated += (sender, e) =>
+				{
+					if (e.Source != ShellNavigationSource.ShellItemChanged)
+					{
+						// Nothing to do.
+						return;
+					}
+
+					// Reset previous user input after switch of pages to allow user to select a differnt bike if one has been selected before.
+					m_oViewModel.BikeIdUserInput = String.Empty;
+				};
+
+			}
+
+			_IsShellItemChangedReceived = true;
+
+			await (m_oViewModel?.OnDisappearing() ?? Task.CompletedTask);
+		}
 
 		/// <summary>
 		/// Displays alert message.
@@ -145,4 +179,4 @@ namespace TINK.View.FindBike
 		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 	}
-}
\ No newline at end of file
+}
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
index 5f147bf..1663f17 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
@@ -267,7 +267,7 @@ namespace TINK.View.Map
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
 		/// </summary>
-		protected override async void OnDisappearing()
+		protected async override void OnDisappearing()
 		{
 			if (MapPageViewModel != null)
 			{
@@ -278,4 +278,4 @@ namespace TINK.View.Map
 			base.OnDisappearing();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Meinkonrad/TINK/View/Settings/SettingsPage.xaml b/Meinkonrad/TINK/View/Settings/SettingsPage.xaml
index 103f8d1..e40abc8 100644
--- a/Meinkonrad/TINK/View/Settings/SettingsPage.xaml
+++ b/Meinkonrad/TINK/View/Settings/SettingsPage.xaml
@@ -60,11 +60,21 @@
                             </ListView>
                         </StackLayout>
                     </Frame>
-                    <Frame 
+					<!-- Picker to selct startup page -->
+					<Frame IsVisible="False">
+						<StackLayout>
+							<Label Text="{x:Static resources:AppResources.MarkingStartupPage}"/>
+							<Picker
+                                ItemsSource="{Binding StartupSettings.ServicesTextList}"
+                                SelectedItem="{Binding StartupSettings.ActiveText}"/>
+						</StackLayout>
+					</Frame>
+					<!-- Themes -->
+					<Frame 
                         IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
-                        <StackLayout>
-                            <!-- Themes -->
-                            <Label
+						<StackLayout>
+
+							<Label
                                 IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
                                 Text="Theme"/>
                             <Picker
@@ -236,4 +246,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 490c349..f297257 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.345" android:versionCode="345">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.346" android:versionCode="346">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index d143f61..700dac6 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -55,8 +55,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>345</string>
+	<string>346</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.345</string>
+	<string>3.0.346</string>
 </dict>
 </plist>
diff --git a/TINK/TINK/App.xaml.cs b/TINK/TINK/App.xaml.cs
index c97fda0..56f3dd8 100644
--- a/TINK/TINK/App.xaml.cs
+++ b/TINK/TINK/App.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -19,6 +19,7 @@ using TINK.Services;
 using TINK.Services.BluetoothLock.Crypto;
 using TINK.Services.Geolocation;
 using TINK.Services.Permissions;
+using TINK.View;
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 #if ARENDI
@@ -83,6 +84,7 @@ namespace TINK
 					settings = new Model.Settings.Settings(
 						null,  // Turn off filtering for sharee.bike- context
 						null,  // Turn off filtering for sharee.bike- context
+						JsonSettingsDictionary.GetStartupSettings(settingsJSON) ?? new StartupSettings(),
 						JsonSettingsDictionary.GetCopriHostUri(settingsJSON),
 						JsonSettingsDictionary.GetPollingParameters(settingsJSON),
 						JsonSettingsDictionary.GetMinimumLoggingLevel(settingsJSON),
@@ -196,10 +198,17 @@ namespace TINK
                 ? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.Root.RootPage()) // Show whats new info.
                 : (Page)new View.Root.RootPage(); // Just start sharee- app            
 #else
-			// Use shell.
+			// Check which page to show first.
+			var mainPage = new View.RootShell.AppShell();
+			var currentItem = Activator.CreateInstance(ModelRoot.StartupSettings.StartupPage.GetViewType()) as ContentPage;
+			if (currentItem != null && ModelRoot.ActiveUser.IsLoggedIn)
+			{
+				mainPage.CurrentItem = currentItem;
+			}
+
 			MainPage = ModelRoot.WhatsNew.IsShowRequired
-			? new View.WhatsNew.WhatsNewPage(() => MainPage = new View.RootShell.AppShell()) // Show whats new info.
-				: (Page)new View.RootShell.AppShell(); // Just start sharee- app
+			? new View.WhatsNew.WhatsNewPage(() => MainPage = mainPage) // Show whats new info.
+				: (Page)mainPage; // Just start sharee- app
 
 #endif
 		}
diff --git a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
index ef10fa7..fc62194 100644
--- a/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
+++ b/TINK/TINK/View/FindBike/FindBikePage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Serilog;
@@ -17,6 +17,11 @@ namespace TINK.View.FindBike
 		/// <summary> Refernce to view model. </summary>
 		FindBikePageViewModel m_oViewModel = null;
 
+		/// <summary>
+		/// Holds a value indicating whether page already subscribed to shell item changes or not.
+		/// </summary>
+		private bool _IsShellItemChangedReceived = false;
+
 		public FindBikePage() { }
 
 		/// <summary>
@@ -69,12 +74,43 @@ namespace TINK.View.FindBike
 
 			InitializeComponent();
 
+
+
 			BindingContext = m_oViewModel;
 			FindBikeListView.ItemsSource = m_oViewModel;
 
 			await m_oViewModel.OnAppearing();
 		}
 
+		/// <summary>
+		/// Invoked when page is disappearing to
+		/// - stop the update process
+		/// - to subscribe to events.
+		/// </summary>
+		protected async override void OnDisappearing()
+		{
+			if (!_IsShellItemChangedReceived && Shell.Current != null)
+			{
+				// Subscribe to events.
+				// Do not do this on startup because Shell.Current is null, if FindeBikePage is startup page.
+				Shell.Current.Navigated += (sender, e) =>
+				{
+					if (e.Source != ShellNavigationSource.ShellItemChanged)
+					{
+						// Nothing to do.
+						return;
+					}
+
+					// Reset previous user input after switch of pages to allow user to select a differnt bike if one has been selected before.
+					m_oViewModel.BikeIdUserInput = String.Empty;
+				};
+
+			}
+
+			_IsShellItemChangedReceived = true;
+
+			await (m_oViewModel?.OnDisappearing() ?? Task.CompletedTask);
+		}
 
 		/// <summary>
 		/// Displays alert message.
@@ -148,4 +184,4 @@ namespace TINK.View.FindBike
 		public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => await Navigation.ShowPopupAsync<FeedbackPopup.Result>(new FeedbackPopup(battery, co2Saving));
 #endif
 	}
-}
\ No newline at end of file
+}
diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs
index 5f147bf..1663f17 100644
--- a/TINK/TINK/View/Map/MapPage.xaml.cs
+++ b/TINK/TINK/View/Map/MapPage.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
@@ -267,7 +267,7 @@ namespace TINK.View.Map
 		/// Invoked when pages is closed/ hidden. 
 		/// Stops update process.
 		/// </summary>
-		protected override async void OnDisappearing()
+		protected async override void OnDisappearing()
 		{
 			if (MapPageViewModel != null)
 			{
@@ -278,4 +278,4 @@ namespace TINK.View.Map
 			base.OnDisappearing();
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TINK/TINK/View/Settings/SettingsPage.xaml b/TINK/TINK/View/Settings/SettingsPage.xaml
index 0bd9a2b..74e1cba 100644
--- a/TINK/TINK/View/Settings/SettingsPage.xaml
+++ b/TINK/TINK/View/Settings/SettingsPage.xaml
@@ -59,10 +59,20 @@
                             </ListView>
                         </StackLayout>
                     </Frame>
-                    <Frame 
+					<!-- Picker to selct startup page -->
+					<Frame>
+						<StackLayout>
+							<Label Text="{x:Static resources:AppResources.MarkingStartupPage}"/>
+							<Picker
+                                ItemsSource="{Binding StartupSettings.ServicesTextList}"
+                                SelectedItem="{Binding StartupSettings.ActiveText}"/>
+						</StackLayout>
+					</Frame>
+					<!-- Themes -->
+					<Frame 
                         IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}">
                         <StackLayout>
-                            <!-- Themes -->
+                            
                             <Label
                                 IsVisible="{Binding DebugLevel, Converter={StaticResource SwitchTheme_Converter}}"
                                 Text="Theme"/>
@@ -235,4 +245,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TINK/TINK/View/ViewTypesTypeProvider.cs b/TINK/TINK/View/ViewTypesTypeProvider.cs
index 30d8cd7..8274b54 100644
--- a/TINK/TINK/View/ViewTypesTypeProvider.cs
+++ b/TINK/TINK/View/ViewTypesTypeProvider.cs
@@ -1,7 +1,8 @@
-using System;
+using System;
 using TINK.View.BikesAtStation;
 using TINK.View.Contact;
 using TINK.View.CopriWebView;
+using TINK.View.FindBike;
 using TINK.View.Info;
 using TINK.View.Info.BikeInfo;
 using TINK.View.Login;
@@ -69,6 +70,9 @@ namespace TINK.View
 				case ViewTypes.MiniSurvey:
 					return typeof(MiniSurveyPage);
 
+				case ViewTypes.FindBikePage:
+					return typeof(FindBikePage);
+
 				default:
 					return typeof(ContentPage);
 			}
diff --git a/TINKLib/Model/ITinkApp.cs b/TINKLib/Model/ITinkApp.cs
index 4c559d2..53d3173 100644
--- a/TINKLib/Model/ITinkApp.cs
+++ b/TINKLib/Model/ITinkApp.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Threading;
@@ -6,6 +6,7 @@ using Serilog.Events;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi.ServerUris;
+using TINK.Model.Settings;
 using TINK.Model.Station;
 using TINK.Services;
 using TINK.Services.BluetoothLock;
@@ -65,6 +66,9 @@ namespace TINK.Model
 		/// <summary> Holds the filters loaded from settings. </summary>
 		IGroupFilterSettings FilterGroupSetting { get; set; }
 
+		/// <summary>Settings determining the startup behavior of the app.</summary>
+		IStartupSettings StartupSettings { get; }
+
 		/// <summary> Value indicating whether map is centerted to current position or not. </summary>
 		bool CenterMapToCurrentLocation { get; set; }
 
@@ -84,10 +88,9 @@ namespace TINK.Model
 		/// <summary> Gets a value indicating whether reporting level is verbose or not.</summary>
 		bool IsReportLevelVerbose { get; set; }
 
-
 		/// <summary> Updates logging level. </summary>
-		/// <param name="p_oNewLevel">New level to set.</param>
-		void UpdateLoggingLevel(LogEventLevel p_oNewLevel);
+		/// <param name="newLogLevel">New level to set.</param>
+		void UpdateLoggingLevel(LogEventLevel newLogLevel);
 
 		/// <summary>Holds uris of copri servers. </summary>
 		CopriServerUriList Uris { get; }
@@ -113,7 +116,7 @@ namespace TINK.Model
 		/// <summary> Holds the stations availalbe. </summary>
 		IEnumerable<IStation> Stations { get; set; }
 
-
+		/// <summary> Holds the Urs to query resources from. </summary>
 		IResourceUrls ResourceUrls { get; set; }
 	}
 
diff --git a/TINKLib/Model/Settings/IStartupSettings.cs b/TINKLib/Model/Settings/IStartupSettings.cs
new file mode 100644
index 0000000..4fdc25e
--- /dev/null
+++ b/TINKLib/Model/Settings/IStartupSettings.cs
@@ -0,0 +1,9 @@
+namespace TINK.Model.Settings
+{
+	/// <summary> Settings determining the startup behavior of the app. </summary>
+	public interface IStartupSettings
+	{
+		/// <summary> Holds the page to show when apps starts. </summary>
+		ViewTypes StartupPage { get; set; }
+	}
+}
diff --git a/TINKLib/Model/Settings/JsonSettingsDictionary.cs b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
index 9080be2..b6095e8 100644
--- a/TINKLib/Model/Settings/JsonSettingsDictionary.cs
+++ b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
@@ -1,6 +1,7 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using Foundation;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Serilog.Events;
@@ -39,6 +40,9 @@ namespace TINK.Model.Settings
 		/// <summary> Key of the center to ... entry. </summary>
 		public const string CENTERMAPTOCURRENTLOCATION = "CenterMapToCurrentLocation";
 
+		/// <summary> Key of the center to ... entry. </summary>
+		public const string STARTUPSETTINGS = "StartupSettings";
+
 		public const string LOGTOEXTERNALFOLDER = "LogToExternalFolder";
 
 		public const string THEMEKEY = "Theme";
@@ -49,7 +53,7 @@ namespace TINK.Model.Settings
 		/// <param name="settingsJSON">Dictionary to get value from.</param>
 		public static T? GetNullableEntry<T>(
 			string keyName,
-			Dictionary<string, string> settingsJSON) where T : struct
+			IDictionary<string, string> settingsJSON) where T : struct
 		{
 			if (!settingsJSON.TryGetValue(keyName, out string boolText)
 				|| string.IsNullOrEmpty(boolText))
@@ -65,7 +69,7 @@ namespace TINK.Model.Settings
 		/// <param name="settingsJSON">Dictionary to get value from.</param>
 		public static T GetEntry<T>(
 			string keyName,
-			Dictionary<string, string> settingsJSON,
+			IDictionary<string, string> settingsJSON,
 			Func<string, string> legacyValueConverter = null) where T : class
 		{
 			if (string.IsNullOrEmpty(keyName)
@@ -465,7 +469,7 @@ namespace TINK.Model.Settings
 		public static bool? GetIsSiteCachingOn(Dictionary<string, string> settingsJSON) => GetNullableEntry<bool>(ISSITECACHINGON, settingsJSON);
 
 		/// <summary> Sets whether to store logging data on SD card or not.</summary>
-		/// <param name="settingsJSON">Dictionary to get value from.</param>
+		/// <param name="settingsJSON">Dictionary to write value to.</param>
 		public static Dictionary<string, string> SetLogToExternalFolder(this IDictionary<string, string> targetDictionary, bool useSdCard) => SetEntry(useSdCard, LOGTOEXTERNALFOLDER, targetDictionary);
 
 		/// <summary> Sets active theme.</summary>
@@ -550,5 +554,28 @@ namespace TINK.Model.Settings
 			settings["FilterCollection"] = JsonConvert.SerializeObject(p_oFilterCollection);
 			return settings;
 		}
+
+		/// <summary>
+		/// Gets the startup settings from dictionary.
+		/// </summary>
+		/// <param name="settings">Settings objet to load from.</param>
+		public static StartupSettings GetStartupSettings(this IDictionary<string, string> settingsJSON)
+			=> GetEntry<StartupSettings>(STARTUPSETTINGS, settingsJSON) ?? new StartupSettings();
+
+		/// <summary> Sets the startup settings.</summary>
+		/// <param name="settingsJSON">Dictionary to write value to.</param>
+		public static IDictionary<string, string> SetStartupSettings(
+			this IDictionary<string, string> settingsJSON,
+			IStartupSettings startupSettings)
+		{
+			if (settingsJSON == null
+				|| startupSettings == null)
+			{
+				return settingsJSON;
+			}
+
+			settingsJSON[STARTUPSETTINGS] = JsonConvert.SerializeObject(startupSettings);
+			return settingsJSON;
+		}
 	}
 }
diff --git a/TINKLib/Model/Settings/Settings.cs b/TINKLib/Model/Settings/Settings.cs
index 0d9ad20..1834a68 100644
--- a/TINKLib/Model/Settings/Settings.cs
+++ b/TINKLib/Model/Settings/Settings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Serilog.Events;
 using TINK.Services.BluetoothLock;
 using TINK.Services.CopriApi.ServerUris;
@@ -27,6 +27,7 @@ namespace TINK.Model.Settings
 		/// <summary> Constructs settings object. </summary>
 		/// <param name="groupFilterMapPage">filter which is applied on the map view. Either TINK or Konrad stations are displayed.</param>
 		/// <param name="groupFilterSettings"></param>
+		/// <param name="startupSettings">Settings determining the startup behavior of the app.</param>
 		/// <param name="activeUri"></param>
 		/// <param name="pollingParameters"></param>
 		/// <param name="minimumLogEventLevel">Minimum logging level to be applied.</param>
@@ -38,6 +39,7 @@ namespace TINK.Model.Settings
 		public Settings(
 			IGroupFilterMapPage groupFilterMapPage = null,
 			IGroupFilterSettings groupFilterSettings = null,
+			IStartupSettings startupSettings = null,
 			Uri activeUri = null,
 			PollingParameters pollingParameters = null,
 			LogEventLevel? minimumLogEventLevel = null,
@@ -54,6 +56,7 @@ namespace TINK.Model.Settings
 		{
 			GroupFilterMapPage = groupFilterMapPage ?? new GroupFilterMapPage(); // Default behaviour: No filtering.
 			GroupFilterSettings = groupFilterSettings ?? new GroupFilterSettings(); // Default behaviour: No filtering.
+			StartupSettings = startupSettings ?? new StartupSettings();
 			ActiveUri = GetActiveUri(activeUri);
 			PollingParameters = pollingParameters ?? PollingParameters.Default;
 			MinimumLogEventLevel = minimumLogEventLevel ?? DEFAULTLOGGINLEVEL;
@@ -75,6 +78,9 @@ namespace TINK.Model.Settings
 		/// <summary> Holds the filters loaded from settings. </summary>
 		public IGroupFilterSettings GroupFilterSettings { get; }
 
+		/// <summary> Holds the stettings determining app startup behavior. </summary>
+		public IStartupSettings StartupSettings { get; }
+
 		/// <summary> Holds the uri to connect to. </summary>
 		public Uri ActiveUri { get; }
 
diff --git a/TINKLib/Model/Settings/StartupSettings.cs b/TINKLib/Model/Settings/StartupSettings.cs
new file mode 100644
index 0000000..8f7d975
--- /dev/null
+++ b/TINKLib/Model/Settings/StartupSettings.cs
@@ -0,0 +1,11 @@
+namespace TINK.Model.Settings
+{
+	/// <summary> Settings determining the startup behavior of the app. </summary>
+	public class StartupSettings : IStartupSettings
+	{
+		public static ViewTypes DefaultStartupPage => ViewTypes.MapPage;
+
+		/// <summary> Holds the page to show when apps starts. </summary>
+		public ViewTypes StartupPage { get; set; } = DefaultStartupPage;
+	}
+}
diff --git a/TINKLib/Model/TinkApp.cs b/TINKLib/Model/TinkApp.cs
index c74dccf..96a3231 100644
--- a/TINKLib/Model/TinkApp.cs
+++ b/TINKLib/Model/TinkApp.cs
@@ -52,6 +52,9 @@ namespace TINK.Model
 		/// <summary> Holds the filters loaded from settings. </summary>
 		public IGroupFilterSettings FilterGroupSetting { get; set; }
 
+		/// <summary> Settings determining the startup behavior of the app.</summary>
+		public IStartupSettings StartupSettings { get; private set; }
+
 		/// <summary> Holds the filter which is applied on the map view. Either TINK or Konrad stations are displayed. </summary>
 		private IGroupFilterMapPage m_oFilterDictionaryMapPage;
 
@@ -73,9 +76,17 @@ namespace TINK.Model
 
 		/// <summary> Holds the map span to display either default span or span centered to current position depending on option <see cref="CenterMapToCurrentLocation"/>.</summary>
 		public Xamarin.Forms.GoogleMaps.MapSpan ActiveMapSpan
-			=> CenterMapToCurrentLocation
-				? UserMapSpan ?? HomeMapSpan
-				: HomeMapSpan;
+		{
+			get
+			{
+				if (CenterMapToCurrentLocation == false)
+				{
+					return HomeMapSpan;
+				}
+
+				return UserMapSpan ?? HomeMapSpan;
+			}
+		}
 
 		/// <summary> Gets the minimum logging level. </summary>
 		public LogEventLevel MinimumLogEventLevel { get; set; }
@@ -95,6 +106,7 @@ namespace TINK.Model
 							.SetCopriHostUri(NextActiveUri.AbsoluteUri)
 							.SetPollingParameters(Polling)
 							.SetGroupFilterSettings(FilterGroupSetting)
+							.SetStartupSettings(StartupSettings)
 							.SetAppVersion(AppVersion)
 							.SetMinimumLoggingLevel(MinimumLogEventLevel)
 							.SetIsReportLevelVerbose(IsReportLevelVerbose)
@@ -238,6 +250,8 @@ namespace TINK.Model
 			FilterGroupSetting = settings.GroupFilterSettings;
 			GroupFilterMapPage = settings.GroupFilterMapPage;
 
+			StartupSettings = settings.StartupSettings;
+
 			CenterMapToCurrentLocation = settings.CenterMapToCurrentLocation;
 
 			HomeMapSpan = settings.MapSpan;
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 77423e1..a578f11 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -614,7 +614,17 @@ namespace TINK.Model
 					new Version(3, 0, 345),
 					AppResources.ChangeLog_3_0_345_LB,
 					new List<AppFlavor> { AppFlavor.LastenradBayern }
-				}
+				},
+				{
+					new Version(3, 0, 346),
+					AppResources.ChangeLog_3_0_346_LB_MK,
+					new List<AppFlavor> { AppFlavor.LastenradBayern, AppFlavor.MeinKonrad }
+				},
+				{
+					new Version(3, 0, 346),
+					AppResources.ChangeLog_3_0_346_SB,
+					new List<AppFlavor> { AppFlavor.ShareeBike }
+				},
 		};
 
 		/// <summary> Manges the whats new information.</summary>
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index f6509ab..9bc0c87 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -668,6 +668,30 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;i&gt;Select Bike&lt;/i&gt; page revised..
+        /// </summary>
+        public static string ChangeLog_3_0_346_LB_MK {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_346_LB_MK", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to &lt;i&gt;Select Bike&lt;/i&gt;- page revised.&lt;br/&gt;
+        ///Setting added to select whether the app starts up showing either
+        ///&lt;ul&gt;
+        ///&lt;li/&gt;&lt;i&gt;Bike Locations&lt;/i&gt; or
+        ///&lt;li/&gt;&lt;i&gt;Select Bike&lt;/i&gt;
+        ///&lt;/ul&gt;
+        ///page..
+        /// </summary>
+        public static string ChangeLog_3_0_346_SB {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_346_SB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!.
         /// </summary>
@@ -2113,6 +2137,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Startup page.
+        /// </summary>
+        public static string MarkingStartupPage {
+            get {
+                return ResourceManager.GetString("MarkingStartupPage", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to App.
         /// </summary>
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 8fb5403..c9d06e7 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -1063,4 +1063,19 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben:
 - Einstellungen sind auch ohne Anmeldung verfügbar.
 - Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht.</value>
   </data>
+  <data name="MarkingStartupPage" xml:space="preserve">
+    <value>Startseite</value>
+  </data>
+  <data name="ChangeLog_3_0_346_LB_MK" xml:space="preserve">
+    <value>&lt;i&gt;Rad auswählen&lt;/i&gt; Seite überarbeitet.</value>
+  </data>
+  <data name="ChangeLog_3_0_346_SB" xml:space="preserve">
+    <value>&lt;i&gt;Rad auswählen&lt;/i&gt;- Seite überarbeitet.&lt;br/&gt;
+Einstellung hinzugefügt mit der festgelegt werden kann, ob die App mit der Seite
+&lt;ul&gt;
+&lt;li/&gt;&lt;i&gt;Radstandorte&lt;/i&gt; oder
+&lt;li/&gt;&lt;i&gt;Rad auswählen&lt;/i&gt;
+&lt;/ul&gt;
+gestartet wird.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index f1106ab..b409329 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -1155,4 +1155,19 @@ You can now see at a glance which app version you have installed: in the menu at
 - Settings are available even if no user is logged in.
 - Order of tabs on instructions page were switched.</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="MarkingStartupPage" xml:space="preserve">
+    <value>Startup page</value>
+  </data>
+  <data name="ChangeLog_3_0_346_LB_MK" xml:space="preserve">
+    <value>&lt;i&gt;Select Bike&lt;/i&gt; page revised.</value>
+  </data>
+  <data name="ChangeLog_3_0_346_SB" xml:space="preserve">
+    <value>&lt;i&gt;Select Bike&lt;/i&gt;- page revised.&lt;br/&gt;
+Setting added to select whether the app starts up showing either
+&lt;ul&gt;
+&lt;li/&gt;&lt;i&gt;Bike Locations&lt;/i&gt; or
+&lt;li/&gt;&lt;i&gt;Select Bike&lt;/i&gt;
+&lt;/ul&gt;
+page.</value>
+  </data>
+</root>
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index e812bee..34d6914 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -1446,6 +1446,30 @@ Sie können nun auf einen Blick sehen, welche App-Version Sie installiert haben:
 - Einstellungen sind auch ohne Anmeldung verfügbar.
 - Die Reihenfolge der Karteikarten auf der Seite Bedienung wurde getauscht.</target>
         </trans-unit>
+        <trans-unit id="MarkingStartupPage" translate="yes" xml:space="preserve">
+          <source>Startup page</source>
+          <target state="translated">Startseite</target>
+        </trans-unit>
+        <trans-unit id="ChangeLog_3_0_346_LB_MK" translate="yes" xml:space="preserve">
+          <source><bpt id="1">&lt;i&gt;</bpt>Select Bike<ept id="1">&lt;/i&gt;</ept> page revised.</source>
+          <target state="translated"><bpt id="1">&lt;i&gt;</bpt>Rad auswählen<ept id="1">&lt;/i&gt;</ept> Seite überarbeitet.</target>
+        </trans-unit>
+        <trans-unit id="ChangeLog_3_0_346_SB" translate="yes" xml:space="preserve">
+          <source><bpt id="1">&lt;i&gt;</bpt>Select Bike<ept id="1">&lt;/i&gt;</ept>- page revised.&lt;br/&gt;
+Setting added to select whether the app starts up showing either
+<bpt id="2">&lt;ul&gt;</bpt>
+&lt;li/&gt;<bpt id="3">&lt;i&gt;</bpt>Bike Locations<ept id="3">&lt;/i&gt;</ept> or
+&lt;li/&gt;<bpt id="4">&lt;i&gt;</bpt>Select Bike<ept id="4">&lt;/i&gt;</ept>
+<ept id="2">&lt;/ul&gt;</ept>
+page.</source>
+          <target state="translated"><bpt id="1">&lt;i&gt;</bpt>Rad auswählen<ept id="1">&lt;/i&gt;</ept>- Seite überarbeitet.&lt;br/&gt;
+Einstellung hinzugefügt mit der festgelegt werden kann, ob die App mit der Seite
+<bpt id="2">&lt;ul&gt;</bpt>
+&lt;li/&gt;<bpt id="3">&lt;i&gt;</bpt>Radstandorte<ept id="3">&lt;/i&gt;</ept> oder
+&lt;li/&gt;<bpt id="4">&lt;i&gt;</bpt>Rad auswählen<ept id="4">&lt;/i&gt;</ept>
+<ept id="2">&lt;/ul&gt;</ept>
+gestartet wird.</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/TINKLib/ViewModel/Bikes/BikesViewModel.cs b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
index eb5ef70..2148550 100644
--- a/TINKLib/ViewModel/Bikes/BikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Threading;
@@ -218,6 +218,12 @@ namespace TINK.ViewModel.Bikes
 					}
 
 					break;
+
+				case System.Collections.Specialized.NotifyCollectionChangedAction.Reset:
+					// Empty collection.
+					// Occurs in context of find bike page when searching for second, third, ... bike (reopen of page via flyout).
+					ClearItems();
+					break;
 			}
 		}
 
@@ -442,11 +448,17 @@ namespace TINK.ViewModel.Bikes
 		}
 
 		/// <summary>
-		/// Invoked when page is shown. 
-		/// Starts update process.
+		/// Invoked when page is shown and starts update process.
 		/// </summary>
 		/// <param name="updateAction"> Update fuction passed as argument by child class.</param>
 		protected async Task OnAppearing(Action updateAction)
+			=> await StartUpdateTask(updateAction);
+
+		/// <summary>
+		/// Starts update process.
+		/// </summary>
+		/// <param name="updateAction"> Update fuction passed as argument by child class.</param>
+		public async Task StartUpdateTask(Action updateAction)
 		{
 			m_oViewUpdateManager = new PollingUpdateTaskManager(updateAction);
 
@@ -465,10 +477,7 @@ namespace TINK.ViewModel.Bikes
 		/// Invoked when page is shutdown. 
 		/// Currently invoked by code behind, would be nice if called by XAML in future versions.
 		/// </summary>
-		public async Task OnDisappearing()
-		{
-
-			await m_oViewUpdateManager.StopUpdatePeridically();
-		}
+		public virtual async Task OnDisappearing()
+			=> await m_oViewUpdateManager.StopUpdatePeridically();
 	}
-}
\ No newline at end of file
+}
diff --git a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
index f9f91be..6525540 100644
--- a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
+++ b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
@@ -13,9 +13,11 @@ using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
+using TINK.Model.Services.CopriApi;
 using TINK.Model.Station;
 using TINK.Model.User;
 using TINK.MultilingualResources;
+using TINK.Repository.Exception;
 using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Tdo;
 using TINK.Services.Geolocation;
@@ -43,6 +45,7 @@ namespace TINK.ViewModel.FindBike
 				}
 
 				bikeIdUserInput = value;
+				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(BikeIdUserInput)));
 				base.OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsSelectBikeEnabled)));
 			}
 		}
@@ -123,14 +126,29 @@ namespace TINK.ViewModel.FindBike
 		/// </summary>
 		public async Task OnAppearing()
 		{
+			IsIdle = false;
+
 			Log.ForContext<FindBikePageViewModel>().Information("User request to show page FindBike- page re-appearing");
 
-			ActionText = AppResources.ActivityTextFindBikeLoadingBikes;
+			if (string.IsNullOrEmpty(BikeIdUserInput) /* Find bike page flyout was taped */
+				&& BikeCollection.Count > 0 /* Bike was successfully selected */)
+			{
+				// Find bike page flyout was taped and page was already opened before and bike has been selected.
+				// Clear bike collection to allow user to enter bike id and search for bike.
+				BikeCollection.Clear();
+			}
 
-			var bikes = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
+			if (BikeCollection.Count > 0)
+			{
+				// Page is appearing not because page flyout was taped.
+				// Bike has already been selected.
+				// Restart update.
+				await StartUpdateTask(() => UpdateTask());
 
-			Exception = bikes.Exception; // Update communication error from query for bikes occupied.
-			Bikes = bikes.Response;
+				ActionText = "";
+				IsIdle = true;
+				return;
+			}
 
 			ActionText = "";
 			IsIdle = true;
@@ -142,6 +160,48 @@ namespace TINK.ViewModel.FindBike
 		/// <summary> Select a bike by ID</summary>
 		public async Task SelectBike()
 		{
+			// Get List of bike to be able to connect to.
+			ActionText = AppResources.ActivityTextFindBikeLoadingBikes;
+			IsIdle = false;
+
+			Result<BikeCollection> bikes = null;
+			try
+			{
+				bikes = await ConnectorFactory(IsConnected).Query.GetBikesAsync();
+			}
+			catch (Exception exception)
+			{
+				if (exception is WebConnectFailureException)
+				{
+					// Copri server is not reachable.
+					Log.ForContext<FindBikePageViewModel>().Information("Getting bikes failed failed (Copri server not reachable).");
+
+					await ViewService.DisplayAdvancedAlert(
+						AppResources.ErrorReturnBikeNoWebTitle,
+						string.Format("{0}\r\n{1}", AppResources.ErrorReturnBikeNoWebMessage, WebConnectFailureException.GetHintToPossibleExceptionsReasons),
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+				else
+				{
+					Log.ForContext<FindBikePageViewModel>().Error("Getting bikes failed. {Exception}", exception);
+
+					await ViewService.DisplayAlert(
+						AppResources.MessageTitleHint,
+						exception.Message,
+						AppResources.MessageAnswerOk);
+				}
+
+				ActionText = "";
+				IsIdle = true;
+				return;
+			}
+			finally
+			{
+				Exception = bikes?.Exception ?? null; // Update communication error from query for bikes occupied.
+				Bikes = bikes.Response;
+			}
+
 			try
 			{
 				var selectedBike = Bikes.FirstOrDefault(x => x.Id.Equals(BikeIdUserInput.Trim(), StringComparison.OrdinalIgnoreCase));
@@ -152,6 +212,9 @@ namespace TINK.ViewModel.FindBike
 						AppResources.MessageTitleHint,
 						string.Format(AppResources.MessageErrorSelectBikeNoBikeFound, BikeIdUserInput),
 						AppResources.MessageAnswerOk);
+
+					ActionText = "";
+					IsIdle = true;
 					return;
 				}
 
@@ -193,7 +256,7 @@ namespace TINK.ViewModel.FindBike
 								// User decided not to give access to locations permissions.
 								BikeCollection.Update(bikeCollection, Stations);
 
-								//await OnAppearing(() => UpdateTask());
+								await StartUpdateTask(() => UpdateTask());
 
 								ActionText = "";
 								IsIdle = true;
@@ -215,7 +278,7 @@ namespace TINK.ViewModel.FindBike
 
 						BikeCollection.Update(bikeCollection, Stations);
 
-						await OnAppearing(() => UpdateTask());
+						await StartUpdateTask(() => UpdateTask());
 
 						ActionText = "";
 						IsIdle = true;
@@ -232,7 +295,7 @@ namespace TINK.ViewModel.FindBike
 
 						BikeCollection.Update(bikeCollection, Stations);
 
-						await OnAppearing(() => UpdateTask());
+						await StartUpdateTask(() => UpdateTask());
 
 						ActionText = "";
 						IsIdle = true;
@@ -259,7 +322,7 @@ namespace TINK.ViewModel.FindBike
 
 				BikeCollection.Update(bikeCollection.UpdateLockInfo(locksInfo), Stations);
 
-				await OnAppearing(() => UpdateTask());
+				await StartUpdateTask(() => UpdateTask());
 
 				ActionText = "";
 				IsIdle = true;
@@ -272,6 +335,9 @@ namespace TINK.ViewModel.FindBike
 					AppResources.MessageAnswerOk);
 
 				Log.ForContext<FindBikePageViewModel>().Error("Running command to select bike failed. {Exception}", exception);
+
+				ActionText = "";
+				IsIdle = true;
 				return;
 			}
 		}
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index b64ada8..fbac705 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -1,4 +1,4 @@
-using Xamarin.Forms;
+using Xamarin.Forms;
 using TINK.View;
 using TINK.Model.Station;
 using System;
@@ -1028,4 +1028,4 @@ namespace TINK.ViewModel.Map
 
 		public bool IsToggleVisible => tinkKonradToggleViewModel.IsToggleVisible;
 	}
-}
\ No newline at end of file
+}
diff --git a/TINKLib/ViewModel/Settings/PickerViewModel.cs b/TINKLib/ViewModel/Settings/PickerViewModel.cs
new file mode 100644
index 0000000..fc2ac60
--- /dev/null
+++ b/TINKLib/ViewModel/Settings/PickerViewModel.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace TINK.ViewModel.Settings
+{
+	/// <summary> Manages data to be shown by a picker. </summary>
+	public class PickerViewModel : ServicesViewModel
+	{
+		/// <summary>Constructs view model ensuring consistency. </summary>
+		/// <param name="serviceToText"> Dictionary holding values and display text to mange and display by picker.</param>
+		/// <param name="active">Value of entry for which the display text has to be shown.</param>
+		public PickerViewModel(
+			IDictionary<string, string> serviceToText,
+			string active) : base(serviceToText.Select(x => x.Key), serviceToText, active)
+		{
+		}
+	}
+}
diff --git a/TINKLib/ViewModel/Settings/ServicesViewModel.cs b/TINKLib/ViewModel/Settings/ServicesViewModel.cs
index 9a59992..6b54294 100644
--- a/TINKLib/ViewModel/Settings/ServicesViewModel.cs
+++ b/TINKLib/ViewModel/Settings/ServicesViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
diff --git a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
index f505615..dd5494f 100644
--- a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
+++ b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -8,6 +8,7 @@ using Serilog.Events;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.User.Account;
+using TINK.MultilingualResources;
 using TINK.Repository.Exception;
 using TINK.Services;
 using TINK.Services.BluetoothLock;
@@ -44,6 +45,9 @@ namespace TINK.ViewModel
 		/// <summary> Manages selection of locks services.</summary>
 		public LocksServicesViewModel LocksServices { get; }
 
+		/// <summary>Settings determining the startup behavior of the app.</summary>
+		public ServicesViewModel StartupSettings { get; } 
+
 		/// <summary> Manages selection of geolocation services.</summary>
 		public ServicesViewModel GeolocationServices { get; }
 
@@ -155,6 +159,13 @@ namespace TINK.ViewModel
 					{ typeof(GeolocationAccuracyBestService).FullName, "Best Accuracy" },
 					{ typeof(SimulatedGeolocationService).FullName, "Simulation-AlwaysSamePosition" } },
 				GeoloctionServicesContainer.Active.GetType().FullName);
+
+			StartupSettings = new PickerViewModel(
+				new Dictionary<string, string> {
+					{ ViewTypes.MapPage.ToString(), AppResources.MarkingMapPage },
+					{ ViewTypes.FindBikePage.ToString(), AppResources.MarkingFindBike },
+				},
+				tinkApp.StartupSettings.StartupPage.ToString());
 		}
 
 		/// <summary>
@@ -259,6 +270,8 @@ namespace TINK.ViewModel
 						TinkApp.GroupFilterMapPage,
 						TinkApp.ActiveUser.DoFilter(TinkApp.FilterGroupSetting.DoFilter()));
 
+				TinkApp.StartupSettings.StartupPage = Enum.TryParse(StartupSettings.Active, out ViewTypes startupPage) ? startupPage : Model.Settings.StartupSettings.DefaultStartupPage;
+
 				TinkApp.CenterMapToCurrentLocation = CenterMapToCurrentLocation;
 
 				if (IsLogToExternalFolderVisible)
diff --git a/TINKLib/ViewTypes.cs b/TINKLib/ViewTypes.cs
index dafe0ad..52f9e92 100644
--- a/TINKLib/ViewTypes.cs
+++ b/TINKLib/ViewTypes.cs
@@ -1,4 +1,4 @@
-namespace TINK
+namespace TINK
 {
 	/// <summary> Holds a entry for each page of the TINK app.</summary>
 	public enum ViewTypes
@@ -18,6 +18,7 @@
 		BikesAtStation,
 		ContactPage,
 		SelectStationPage,
-		MiniSurvey
+		MiniSurvey,
+		FindBikePage
 	}
 }
diff --git a/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs b/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
index a8f4886..005de0c 100644
--- a/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
+++ b/TestShareeLib/Model/Settings/TestJsonSettingsDictionary.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -172,5 +172,31 @@ namespace TestTINKLib.Model.Settings
 				settings["Theme"],
 				Is.EqualTo(JsonConvert.SerializeObject(typeof(TINK.Themes.Konrad).Name)));
 		}
+
+		[Test]
+		public void TestGetStartupSettingsStartupPage() => Assert.That(
+			JsonSettingsDictionary.GetStartupSettings(new Dictionary<string, string> {
+				{
+					"StartupSettings",
+					JsonConvert.SerializeObject(new StartupSettings { StartupPage = TINK.ViewTypes.ContactPage})
+				}
+			}).StartupPage,
+			Is.EqualTo(TINK.ViewTypes.ContactPage));
+
+		[Test]
+		public void TestSetStartupSettingsStartupPage()
+		{
+			var settings = JsonSettingsDictionary.SetStartupSettings(
+				new Dictionary<string, string>(),
+				new StartupSettings { StartupPage = TINK.ViewTypes.ContactPage });
+
+			Assert.That(
+				settings,
+				Contains.Key("StartupSettings"));
+
+			Assert.That(
+				settings["StartupSettings"],
+				Is.EqualTo(JsonConvert.SerializeObject(new StartupSettings { StartupPage = TINK.ViewTypes.ContactPage })));
+		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
index 6e48cc1..c869b65 100644
--- a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
+++ b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -15,6 +15,7 @@ using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
+using TINK.Model.Settings;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Services;
@@ -45,9 +46,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			var bluetooth = Substitute.For<IBluetoothLE>();
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -130,9 +132,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -212,9 +215,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -336,9 +340,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -463,9 +468,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -587,9 +593,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -709,9 +716,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -824,9 +832,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -902,9 +911,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			const string MERCH_ID = "MyMerchId";
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -973,9 +983,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			timeOut.MultiConnect.Returns(new TimeSpan(0));
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -1054,9 +1065,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			timeOut.MultiConnect.Returns(new TimeSpan(0));
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -1128,9 +1140,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			timeOut.MultiConnect.Returns(new TimeSpan(0));
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -1218,9 +1231,10 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 			timeOut.MultiConnect.Returns(new TimeSpan(0));
 
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000),
 					true),
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
index 06ee6e3..01a88a2 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Account/TestAccountPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using NSubstitute;
@@ -14,6 +14,7 @@ using TestFramework.Services.CopriApi.Connector;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
+using TINK.Model.Settings;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Services;
@@ -38,6 +39,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -82,6 +84,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -125,6 +128,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -167,6 +171,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -209,6 +214,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Account
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
index 217a156..560f537 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/Map/TestMapPageViewModel.cs
@@ -14,6 +14,7 @@ using TestFramework.Services.CopriApi.Connector;
 using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
+using TINK.Model.Settings;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Services;
@@ -34,9 +35,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -114,9 +116,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_KonradActive()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -191,9 +194,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_KonradOnly()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CITYBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.Off }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -263,9 +267,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_TinkOnly()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -335,9 +340,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_Offline()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -409,9 +415,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_WebConnectCommunicationError()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -498,9 +505,10 @@ namespace TestShareeLib.UseCases.Startup
 		public async Task TestConstruct_GeneralPurposeCommunicationError()
 		{
 			var tinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { FilterHelper.CARGOBIKE, FilterState.On }, { FilterHelper.CITYBIKE, FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://tinkwwp.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
diff --git a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
index 05fb047..c836da1 100644
--- a/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/ViewModel/TestMyBikesPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -15,6 +15,7 @@ using TINK.Model;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
+using TINK.Model.Settings;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Services;
@@ -64,6 +65,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -160,6 +162,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -264,6 +267,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -363,6 +367,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -460,6 +465,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -551,6 +557,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -617,6 +624,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -686,6 +694,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -771,6 +780,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				new TINK.Model.Settings.Settings(
 					new GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.Off } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
diff --git a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
index 213f6a9..bc2ce7c 100644
--- a/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
+++ b/TestTINKLib/Fixtures/UseCases/SelectStation/TestTinkApp.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using NSubstitute;
 using NUnit.Framework;
@@ -9,6 +9,7 @@ using TestFramework.Model.User.Account;
 using TestFramework.Services.BluetoothLock;
 using TINK.Model;
 using TINK.Model.Connector;
+using TINK.Model.Settings;
 using TINK.Repository;
 using TINK.Services;
 using TINK.Services.Geolocation;
@@ -35,9 +36,10 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation
 					new CopriCallsMemory(MERCH_ID, SampleSets.Set2, 1));
 
 			var l_oTinkApp = new TinkApp(
-				new TINK.Model.Settings.Settings(
+				new Settings(
 					new TINK.ViewModel.Map.GroupFilterMapPage(new Dictionary<string, FilterState> { { "TINK", FilterState.On } }),
 					new GroupFilterSettings(new Dictionary<string, FilterState> { { "TINK", FilterState.On }, { "Konrad", FilterState.On } }),
+					new StartupSettings(),
 					new Uri("https://shareeapp-primary.copri-bike.de/APIjsonserver"),
 					new TINK.Settings.PollingParameters(new TimeSpan(10000), true),
 					Serilog.Events.LogEventLevel.Error,
@@ -79,4 +81,4 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation
 			Assert.AreEqual(0, TestHelper.GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 		}
 	}
-}
\ No newline at end of file
+}