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}"/> +