diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
index aa1a89b..6e01cc9 100644
--- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
+++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj
@@ -652,6 +652,24 @@
MSBuild:UpdateGeneratedFiles
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 1125868..3b9432e 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/LastenradBayern/TINK.Android/Resources/drawable-hdpi/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable-hdpi/sharee_no_background.png
index 72e0c84..bec6ea9 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable-hdpi/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable-hdpi/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.Android/Resources/drawable-mdpi/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable-mdpi/sharee_no_background.png
index 3115045..7ea4687 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable-mdpi/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable-mdpi/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.Android/Resources/drawable-xhdpi/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable-xhdpi/sharee_no_background.png
index abf7249..5c80ee2 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable-xhdpi/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable-xhdpi/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/sharee_no_background.png
index 306238c..15514ec 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable-xxhdpi/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/sharee_no_background.png
index e417ff8..e70a9d0 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable-xxxhdpi/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.Android/Resources/drawable/sharee_no_background.png b/LastenradBayern/TINK.Android/Resources/drawable/sharee_no_background.png
index e417ff8..e70a9d0 100644
Binary files a/LastenradBayern/TINK.Android/Resources/drawable/sharee_no_background.png and b/LastenradBayern/TINK.Android/Resources/drawable/sharee_no_background.png differ
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index e58c8e9..0ee614e 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
CFBundleDisplayName
LastenradBayern
CFBundleVersion
- 276
+ 277
CFBundleShortVersionString
- 3.0.276
+ 3.0.277
diff --git a/LastenradBayern/TINK/App.xaml.cs b/LastenradBayern/TINK/App.xaml.cs
index a5e8ad7..16811c3 100644
--- a/LastenradBayern/TINK/App.xaml.cs
+++ b/LastenradBayern/TINK/App.xaml.cs
@@ -135,13 +135,13 @@ namespace TINK
store = new Store();
- Barrel.ApplicationId = "TINKApp";
+ Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
var context = SynchronizationContext.Current;
var appInfoService = DependencyService.Get();
- const string MERCHANTID = "baei987w";
+ const string MERCHANTID = "23456789";
// Create new app instnace.
Log.Debug("Constructing main model...");
diff --git a/LastenradBayern/TINK/BackdoorMethodHelpers.cs b/LastenradBayern/TINK/BackdoorMethodHelpers.cs
index c151820..1e09835 100644
--- a/LastenradBayern/TINK/BackdoorMethodHelpers.cs
+++ b/LastenradBayern/TINK/BackdoorMethodHelpers.cs
@@ -30,7 +30,7 @@ namespace TINK
#if USEFLYOUT
return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
#else
- return (Application.Current.MainPage as AppShellViewModel)?.Detail.Navigation.NavigationStack.LastOrDefault();
+ return Shell.Current.CurrentPage;
#endif
}
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
index 5553f32..b26f066 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml.cs
@@ -1,7 +1,9 @@
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
+#if USEFLYOUT
using TINK.View.MasterDetail;
+#endif
using TINK.ViewModel.Info;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@@ -9,8 +11,11 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Contact
{
[XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class ContactPage : ContentPage, IViewService, IDetailPage
-
+#if USEFLYOUT
+ public partial class ContactPage : ContentPage, IViewService, IDetailPage
+#else
+ public partial class ContactPage : ContentPage, IViewService
+#endif
{
public ContactPage ()
{
@@ -71,8 +76,8 @@ namespace TINK.View.Contact
/// Pushes a page onto the stack.
/// Page to display.
public async Task PushAsync(ViewTypes typeOfPage)
- {
-
+ {
+#if USEFLYOUT
if (!(Activator.CreateInstance(typeOfPage.GetViewType()) is IDetailPage detailPage))
{
await Task.CompletedTask;
@@ -83,6 +88,7 @@ namespace TINK.View.Contact
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
+#endif
}
#if USCSHARP9
diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
index 3f528cc..2ee8950 100644
--- a/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
+++ b/LastenradBayern/TINK/View/Map/MapPage.xaml.cs
@@ -103,7 +103,7 @@ namespace TINK.View.Map
#if USEFLYOUT
var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
#else
- var page = Activator.CreateInstance(p_oTypeOfPage.GetViewType());
+ var page = Activator.CreateInstance(typeOfPage.GetViewType());
#endif
if (page == null)
{
diff --git a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
index 9e77d13..b213b5b 100644
--- a/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
+++ b/LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml
@@ -7,6 +7,7 @@
+
+ Text="{Binding MasterDetailMenuTitlte}"/>
+
\ No newline at end of file
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index d59defa..6fa1a8c 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index 73dffbe..4ecb552 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
CFBundleDisplayName
Mein konrad
CFBundleVersion
- 276
+ 277
CFBundleShortVersionString
- 3.0.276
+ 3.0.277
diff --git a/Meinkonrad/TINK/App.xaml.cs b/Meinkonrad/TINK/App.xaml.cs
index 5ec0192..cba6fb7 100644
--- a/Meinkonrad/TINK/App.xaml.cs
+++ b/Meinkonrad/TINK/App.xaml.cs
@@ -134,13 +134,13 @@ namespace TINK
store = new Store();
- Barrel.ApplicationId = "TINKApp";
+ Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
var context = SynchronizationContext.Current;
var appInfoService = DependencyService.Get();
- const string MERCHANTID = "mkef9BuN";
+ const string MERCHANTID = "23456789";
// Create new app instnace.
Log.Debug("Constructing main model...");
diff --git a/Meinkonrad/TINK/BackdoorMethodHelpers.cs b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
index c151820..1e09835 100644
--- a/Meinkonrad/TINK/BackdoorMethodHelpers.cs
+++ b/Meinkonrad/TINK/BackdoorMethodHelpers.cs
@@ -30,7 +30,7 @@ namespace TINK
#if USEFLYOUT
return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
#else
- return (Application.Current.MainPage as AppShellViewModel)?.Detail.Navigation.NavigationStack.LastOrDefault();
+ return Shell.Current.CurrentPage;
#endif
}
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
index 5553f32..ba159cf 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
@@ -1,7 +1,9 @@
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
+#if USEFLYOUT
using TINK.View.MasterDetail;
+#endif
using TINK.ViewModel.Info;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@@ -9,10 +11,14 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Contact
{
[XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class ContactPage : ContentPage, IViewService, IDetailPage
+#if USEFLYOUT
+ public partial class ContactPage : ContentPage, IViewService, IDetailPage
+#else
+ public partial class ContactPage : ContentPage, IViewService
+#endif
{
- public ContactPage ()
+ public ContactPage ()
{
InitializeComponent ();
@@ -71,8 +77,8 @@ namespace TINK.View.Contact
/// Pushes a page onto the stack.
/// Page to display.
public async Task PushAsync(ViewTypes typeOfPage)
- {
-
+ {
+#if USEFLYOUT
if (!(Activator.CreateInstance(typeOfPage.GetViewType()) is IDetailPage detailPage))
{
await Task.CompletedTask;
@@ -83,6 +89,7 @@ namespace TINK.View.Contact
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
+#endif
}
#if USCSHARP9
diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
index 3f528cc..2ee8950 100644
--- a/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
+++ b/Meinkonrad/TINK/View/Map/MapPage.xaml.cs
@@ -103,7 +103,7 @@ namespace TINK.View.Map
#if USEFLYOUT
var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
#else
- var page = Activator.CreateInstance(p_oTypeOfPage.GetViewType());
+ var page = Activator.CreateInstance(typeOfPage.GetViewType());
#endif
if (page == null)
{
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index 9f8d0fd..3ad2441 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index d489f91..1ad57b1 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -53,8 +53,8 @@
CFBundleDisplayName
sharee.bike
CFBundleVersion
- 276
+ 277
CFBundleShortVersionString
- 3.0.276
+ 3.0.277
diff --git a/TINK/TINK/App.xaml.cs b/TINK/TINK/App.xaml.cs
index e8d2834..2e202c3 100644
--- a/TINK/TINK/App.xaml.cs
+++ b/TINK/TINK/App.xaml.cs
@@ -134,13 +134,13 @@ namespace TINK
store = new Store();
- Barrel.ApplicationId = "TINKApp";
+ Barrel.ApplicationId = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
var context = SynchronizationContext.Current;
var appInfoService = DependencyService.Get();
- const string MERCHANTID = "oiF2kahH";
+ const string MERCHANTID = "23456789";
// Create new app instnace.
Log.Debug("Constructing main model...");
diff --git a/TINK/TINK/BackdoorMethodHelpers.cs b/TINK/TINK/BackdoorMethodHelpers.cs
index c151820..1e09835 100644
--- a/TINK/TINK/BackdoorMethodHelpers.cs
+++ b/TINK/TINK/BackdoorMethodHelpers.cs
@@ -30,7 +30,7 @@ namespace TINK
#if USEFLYOUT
return (Application.Current.MainPage as FlyoutPage)?.Detail.Navigation.NavigationStack.LastOrDefault();
#else
- return (Application.Current.MainPage as AppShellViewModel)?.Detail.Navigation.NavigationStack.LastOrDefault();
+ return Shell.Current.CurrentPage;
#endif
}
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml.cs b/TINK/TINK/View/Contact/ContactPage.xaml.cs
index 5553f32..ba159cf 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml.cs
+++ b/TINK/TINK/View/Contact/ContactPage.xaml.cs
@@ -1,7 +1,9 @@
using System;
using System.Threading.Tasks;
using TINK.Model.Device;
+#if USEFLYOUT
using TINK.View.MasterDetail;
+#endif
using TINK.ViewModel.Info;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@@ -9,10 +11,14 @@ using Xamarin.Forms.Xaml;
namespace TINK.View.Contact
{
[XamlCompilation(XamlCompilationOptions.Compile)]
- public partial class ContactPage : ContentPage, IViewService, IDetailPage
+#if USEFLYOUT
+ public partial class ContactPage : ContentPage, IViewService, IDetailPage
+#else
+ public partial class ContactPage : ContentPage, IViewService
+#endif
{
- public ContactPage ()
+ public ContactPage ()
{
InitializeComponent ();
@@ -71,8 +77,8 @@ namespace TINK.View.Contact
/// Pushes a page onto the stack.
/// Page to display.
public async Task PushAsync(ViewTypes typeOfPage)
- {
-
+ {
+#if USEFLYOUT
if (!(Activator.CreateInstance(typeOfPage.GetViewType()) is IDetailPage detailPage))
{
await Task.CompletedTask;
@@ -83,6 +89,7 @@ namespace TINK.View.Contact
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
+#endif
}
#if USCSHARP9
diff --git a/TINK/TINK/View/Map/MapPage.xaml.cs b/TINK/TINK/View/Map/MapPage.xaml.cs
index 3f528cc..2ee8950 100644
--- a/TINK/TINK/View/Map/MapPage.xaml.cs
+++ b/TINK/TINK/View/Map/MapPage.xaml.cs
@@ -103,7 +103,7 @@ namespace TINK.View.Map
#if USEFLYOUT
var page = Activator.CreateInstance(typeOfPage.GetViewType()) as IDetailPage;
#else
- var page = Activator.CreateInstance(p_oTypeOfPage.GetViewType());
+ var page = Activator.CreateInstance(typeOfPage.GetViewType());
#endif
if (page == null)
{
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 2ef5d5e..4ccd15c 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -477,7 +477,11 @@ namespace TINK.Model
},
{
new Version(3, 0, 276),
- AppResources.ChangeLog3_0_276
+ AppResources.ChangeLog3_0_276
+ },
+ {
+ new Version(3, 0, 277),
+ AppResources.ChangeLog3_0_277
}
};
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index a6c3a71..0811b73 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -920,6 +920,15 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to Bugfix: No more closing of app on Select Bike page..
+ ///
+ public static string ChangeLog3_0_277 {
+ get {
+ return ResourceManager.GetString("ChangeLog3_0_277", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Lock of rented bike can not be found..
///
@@ -1736,6 +1745,24 @@ namespace TINK.MultilingualResources {
}
}
+ ///
+ /// Looks up a localized string similar to No bike with id {0} found..
+ ///
+ public static string MessageErrorSelectBikeNoBikeFound {
+ get {
+ return ResourceManager.GetString("MessageErrorSelectBikeNoBikeFound", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Error Selecting Bike!.
+ ///
+ public static string MessageErrorSelectBikeTitle {
+ get {
+ return ResourceManager.GetString("MessageErrorSelectBikeTitle", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to Login cookie must not be empty. {0}.
///
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index 187dfff..3bcd02f 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -742,4 +742,13 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.
Beim Umschalten zwischen Lasten-/ Stadträdern ist ein Fehler aufgetreten.
{0}
+
+ Kein Fahrrad mit Id {0} gefunden.
+
+
+ Fehler beim Rad Wählen!
+
+
+ Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.
+
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 4b6c2b8..fd03bdb 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -837,4 +837,13 @@ Bugfix: Sending support mails works again.
An error occurred switching from cargo bikes/ city bikes.
{0}
+
+ No bike with id {0} found.
+
+
+ Error Selecting Bike!
+
+
+ Bugfix: No more closing of app on Select Bike page.
+
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index a1cc748..e26a203 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -998,6 +998,18 @@ Fehlerbehebung: Supportmails können wieder verschickt werden.
Beim Umschalten zwischen Lasten-/ Stadträdern ist ein Fehler aufgetreten.
{0}
+
+
+ Kein Fahrrad mit Id {0} gefunden.
+
+
+
+ Fehler beim Rad Wählen!
+
+
+
+ Fehlerbehebung: App schließt sich nicht mehr auf Fahrrad Wählen-Seite.
+