diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml index 3681d0b..8b2af09 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 b99f38b..2323370 100644 --- a/TINK/TINK.iOS/Info.plist +++ b/TINK/TINK.iOS/Info.plist @@ -49,8 +49,8 @@ CFBundleDisplayName sharee.bike CFBundleVersion - 242 + 243 CFBundleShortVersionString - 3.0.242 + 3.0.241 diff --git a/TINK/TINK/TINK.projitems b/TINK/TINK/TINK.projitems index 3c2cc43..2ce4c27 100644 --- a/TINK/TINK/TINK.projitems +++ b/TINK/TINK/TINK.projitems @@ -43,6 +43,19 @@ Code + + MiniSurveyPage.xaml + Code + + + CheckOneViewCell.xaml + Code + + + FreeTextViewCell.xaml + Code + + FlyoutHeader.xaml Code @@ -335,4 +348,22 @@ MSBuild:UpdateDesignTimeXaml + + + Designer + MSBuild:UpdateDesignTimeXaml + + + + + Designer + MSBuild:UpdateDesignTimeXaml + + + + + Designer + MSBuild:UpdateDesignTimeXaml + + \ No newline at end of file diff --git a/TINK/TINK/View/Account/AccountPage.xaml.cs b/TINK/TINK/View/Account/AccountPage.xaml.cs index e8d0813..7f96747 100644 --- a/TINK/TINK/View/Account/AccountPage.xaml.cs +++ b/TINK/TINK/View/Account/AccountPage.xaml.cs @@ -101,8 +101,8 @@ namespace TINK.View.Account /// Pushes a page onto the modal stack. /// Page to display. - public Task PushModalAsync(ViewTypes p_oTypeOfPage) - => throw new NotImplementedException(); + public Task PushModalAsync(ViewTypes typeOfPage) + => Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType())); /// Pops a page from the modal stack. public Task PopModalAsync() diff --git a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs index 9c69296..6a21237 100644 --- a/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs +++ b/TINK/TINK/View/BikesAtStation/BikesAtStationPage.xaml.cs @@ -194,11 +194,9 @@ using TINK.View.MasterDetail; /// Pushes a page onto the modal stack. - /// Page to display. - public Task PushModalAsync(ViewTypes p_oTypeOfPage) - { - throw new NotSupportedException(); - } + /// Page to display. + public async Task PushModalAsync(ViewTypes typeOfPage) + => await Navigation.PushModalAsync((Page)Activator.CreateInstance(typeOfPage.GetViewType())); /// Pops a page from the modal stack. public Task PopModalAsync() diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml index 7afe046..44c8594 100644 --- a/TINK/TINK/View/Contact/ContactPage.xaml +++ b/TINK/TINK/View/Contact/ContactPage.xaml @@ -17,6 +17,7 @@ IsVisible="{Binding Path=IsOperatorInfoAvaliable, Converter={StaticResource BoolInvert_Converter}}"> +