roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-04-19 11:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

3.0.277

Browse source
This commit is contained in:
Oliver Hauff 2022-01-22 18:32:22 +01:00
parent 6ed1579494
commit 3c97e2f4aa
34 changed files with 278 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
View file

@ -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.276" android:versionCode="276">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" 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 -->

4
Meinkonrad/TINK.iOS/Info.plist
View file

@ -53,8 +53,8 @@
<key>CFBundleDisplayName</key>
<string>Mein konrad</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>

4
Meinkonrad/TINK/App.xaml.cs
View file

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

2
Meinkonrad/TINK/BackdoorMethodHelpers.cs
View file

@ -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
}

15
Meinkonrad/TINK/View/Contact/ContactPage.xaml.cs
View file

@ -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
/// <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 +89,7 @@ namespace TINK.View.Contact
detailPage.NavigationMasterDetail = NavigationMasterDetail;
await Navigation.PushAsync((Page)detailPage);
#endif
}
#if USCSHARP9

2
Meinkonrad/TINK/View/Map/MapPage.xaml.cs
View file

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