Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ protected override void OnSleep()
this.PopupPluginOnSleep();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public DismissableDialog()
InitializeComponent();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ public void OnDialogClosed()

public void OnDialogOpened(IDialogParameters parameters) { }
}
}
}
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

[assembly: XamlCompilation(XamlCompilationOptions.Compile)]
[assembly: InternalsVisibleTo("PopupPluginSample.Droid")]
[assembly: InternalsVisibleTo("PopupPluginSample.iOS")]
[assembly: InternalsVisibleTo("PopupPluginSample.iOS")]
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/ViewModels/BaseViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ protected virtual async void OnGoBackCommandExecuted()
private void CanExecuteChanged(object sender, EventArgs args) =>
WriteLine($"Can Execute Changed: {((ICommand)sender).CanExecute(string.Empty)}");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public MDPRootViewModel(INavigationService navigationService)
{
}
}
}
}
11 changes: 5 additions & 6 deletions samples/src/PopupPluginSample/ViewModels/MainPageViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Prism.Commands;
using Prism.Mvvm;
using Prism.Navigation;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Prism.Commands;
using Prism.Mvvm;
using Prism.Navigation;

namespace PopupPluginSample.ViewModels
{
Expand All @@ -19,5 +19,4 @@ public MainPageViewModel(INavigationService navigationService)
private async void OnLaunchPopupCommandExecuted() =>
await _navigationService.NavigateAsync("PopupView");
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public MenuPageViewModel(INavigationService navigationService)
{
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public NavigationRootViewModel(INavigationService navigationService)
{
}
}
}
}
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/ViewModels/PopupViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ public Task<bool> CanNavigateAsync(INavigationParameters parameters)
return _pageDialogService.DisplayAlertAsync("Go Back", "You pressed the hardware back button. Are you sure you want to leave?", "Yes", "No");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public TabbedRootViewModel(INavigationService navigationService)
{
}
}
}
}
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/Views/MDPRoot.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public MDPRoot()

public bool IsPresentedAfterNavigation => Device.Idiom != TargetIdiom.Phone;
}
}
}
3 changes: 1 addition & 2 deletions samples/src/PopupPluginSample/Views/MainPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ public MainPage()
InitializeComponent();
}
}
}

}
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/Views/MenuPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public MenuPage()
InitializeComponent();
}
}
}
}
3 changes: 1 addition & 2 deletions samples/src/PopupPluginSample/Views/NavigationRoot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ public class NavigationRoot : NavigationPage
{

}
}

}
7 changes: 3 additions & 4 deletions samples/src/PopupPluginSample/Views/PopupView.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Xamarin.Forms;
using Rg.Plugins.Popup;
using Rg.Plugins.Popup;
using Rg.Plugins.Popup.Pages;
using Xamarin.Forms;

namespace PopupPluginSample.Views
{
Expand All @@ -25,5 +25,4 @@ private void AnnounceBindingContext()
}

}
}

}
2 changes: 1 addition & 1 deletion samples/src/PopupPluginSample/Views/TabbedRoot.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public TabbedRoot()
InitializeComponent();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ protected override Task HandleNavigation(INavigationParameters parameters, INavi
return base.HandleNavigation(parameters, navigationService);
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/ApplicationLifecycleExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ private static void InvokeLifecyleEvent(PrismApplicationBase app, Action<IApplic
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ private Page TopPage()
return page.GetDisplayedPage();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public static class KnownPopupDialogParameters
/// </summary>
public const string Animated = "animated";
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/Dialogs/PopupDialogContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ namespace Prism.Plugin.Popups.Dialogs
internal class PopupDialogContainer : PopupPage
{
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/Dialogs/PopupDialogService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -313,4 +313,4 @@ private class DialogResult : IDialogResult
public IDialogParameters Parameters { get; set; }
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
throw new NotImplementedException();
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/Dialogs/Xaml/PopupDialogLayout.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,4 @@ public static void SetHasKeyboardOffset(BindableObject view, bool value)
view.SetValue(HasKeyboardOffsetProperty, value);
}
}
}
}
4 changes: 2 additions & 2 deletions src/Prism.Plugin.Popups/Extensions/PageExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;
using Xamarin.Forms;
using System.Reflection;
using Xamarin.Forms;

namespace Prism.Plugin.Popups.Extensions
{
Expand Down Expand Up @@ -46,4 +46,4 @@ public static Page GetDisplayedPage(this Page page)
return page;
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ private static INavigationParameters GetNavigationParameters(string key, object
{ key, param }
}.AddNavigationMode(mode);
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupNavigationException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ public PopupNavigationException(Page page)

}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupPageBehaviorFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ protected override void ApplyPageBehaviors(Xamarin.Forms.Page page)
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupPageNavigationService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -342,4 +342,4 @@ protected override Page GetCurrentPage()
return base.GetCurrentPage();
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ public static async void OnBackPressed()
}
}
}
#endif
#endif
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/PopupRegistrationExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ private static void RegisterPopupNavigation(this IContainerRegistry containerReg
}
}
}
}
}
6 changes: 3 additions & 3 deletions src/Prism.Plugin.Popups/PopupUtilities.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Prism.Common;
using System.Linq;
using Prism.Common;
using Prism.Navigation;
using Prism.Plugin.Popups.Dialogs;
using Prism.Plugin.Popups.Extensions;
using Rg.Plugins.Popup.Contracts;
using System.Linq;
using Xamarin.Forms;

namespace Prism.Plugin.Popups
Expand Down Expand Up @@ -62,4 +62,4 @@ public static Page GetOnNavigatedToTarget(IPopupNavigation popupNavigation, IApp
return page.GetDisplayedPage();
}
}
}
}
2 changes: 1 addition & 1 deletion src/Prism.Plugin.Popups/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
[assembly: XmlnsDefinition("http://prismlibrary.com", "Prism.Plugin.Popups.Dialogs.Xaml")]

[assembly: InternalsVisibleTo("Prism.Plugin.Popups.DryIoc.Tests")]
[assembly: InternalsVisibleTo("Prism.Plugin.Popups.Unity.Tests")]
[assembly: InternalsVisibleTo("Prism.Plugin.Popups.Unity.Tests")]
2 changes: 1 addition & 1 deletion tests/Prism.Plugin.Popups.Tests.Shared/Mocks/AppMock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ public INavigationService GetNavigationService(Page page = null)
return navService;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ namespace Prism.Plugin.Popups.Tests.Mocks.Events
public class NavigatedFromEvent : PubSubEvent
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ public Task RemovePageAsync(PopupPage page, bool animate = true)
return Task.CompletedTask;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ public MainPageViewModel(INavigationService navigationService)

public INavigationService NavigationService { get; set; }
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Prism.Events;
using System;
using System.Collections.Generic;
using System.Text;
using Prism.Events;
using Prism.Mvvm;
using Prism.Navigation;
using Prism.Plugin.Popups.Tests.Mocks.Events;
using System;
using System.Collections.Generic;
using System.Text;

namespace Prism.Plugin.Popups.Tests.Mocks.ViewModels
{
Expand Down Expand Up @@ -39,4 +39,4 @@ public void Destroy()
Destroyed++;
}
}
}
}
2 changes: 1 addition & 1 deletion tests/Prism.Plugin.Popups.Tests.Shared/Mocks/Views/MDP.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public MDP()
};
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public MainPage()
Content = new Label { Text = "Hello World" };
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public PopupPageMock()
Content = new Label { Text = "Hello World" };
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public ViewA()
Content = new Label { Text = "Hello ViewA" };
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public ViewB()
Content = new Label { Text = "Hello ViewB" };
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ public void RegisterTypes(IContainerRegistry containerRegistry)
containerRegistry.RegisterInstance(_testOutputHelper);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ protected AppMock GetApp()
return new AppMock(new XUnitPlatformInitializer(_testOutputHelper));
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@ public async Task PopupPageIsDestroyed_WhenNavigatingToContentPage()
Assert.Equal(1, vm.Destroyed);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public async Task GetsCorrectTopPage(string uri, Type pageType)
Assert.IsType<PopupPageMock>(topPage);
}
}
}
}
Loading