3.0.277

LastenradBayern/TINK.Android/LastenradBayern.Android.csproj

@@ -652,6 +652,24 @@
       <Generator>MSBuild:UpdateGeneratedFiles</Generator>
     </AndroidResource>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\sharee_no_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-hdpi\sharee_no_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-mdpi\sharee_no_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xhdpi\sharee_no_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxhdpi\sharee_no_background.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable-xxxhdpi\sharee_no_background.png" />
+  </ItemGroup>
   <Import Project="..\TINK\LastenradBayern.projitems" Label="Shared" Condition="Exists('..\TINK\LastenradBayern.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>

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.276" android:versionCode="276">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.277" android:versionCode="277">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30" />
 	<!-- Google Maps related permissions -->
   <!-- Permission to receive remote notifications from Google Play Services -->

LastenradBayern/TINK.iOS/Info.plist

@@ -53,8 +53,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>276</string>
+	<string>277</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.276</string>
+	<string>3.0.277</string>
 </dict>
 </plist>

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<IAppInfo>();
 
-                const string MERCHANTID = "baei987w";
+                const string MERCHANTID = "23456789";
 
                 // Create new app instnace.
                 Log.Debug("Constructing main model...");

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
         }
 

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
         /// <summary> Pushes a page onto the stack. </summary>
         /// <param name="typeOfPage">Page to display.</param>
         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

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)
             {

LastenradBayern/TINK/View/RootShell/FlyoutHeader.xaml

@@ -7,6 +7,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
             <RowDefinition Height="30" />
+            <RowDefinition Height="30" />
         </Grid.RowDefinitions>
         <Image 
                       HeightRequest="140"
@@ -16,6 +17,12 @@
             HorizontalOptions="CenterAndExpand"
             FontSize="Large"
             Grid.Row="1" 
-            Text="{Binding MasterDetailMenuTitlte}"/>    
+            Text="{Binding MasterDetailMenuTitlte}"/>
+        <Label 
+            HorizontalOptions="CenterAndExpand"
+            FontSize="Micro"
+            HorizontalTextAlignment="Center"
+            Grid.Row="2" 
+            Text="gefördert vom Bayrischen Staatministerium für Wohnen, Bau und Verkehr"/>
     </Grid>
 </ContentView>