Skip to content

Commit 65e5ae5

Browse files
martijn00martijn00
authored
Merge pull request #584 from dansiegel/xmlns
add XmlnsDefinition
2 parents 486fbc7 + ba963e8 commit 65e5ae5

File tree

8 files changed

+58
-56
lines changed

8 files changed

+58
-56
lines changed

‎Rg.Plugins.Popup/Properties/AssemblyInfo.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
using Xamarin.Forms;
2+
3+
[assembly: XmlnsDefinition("http://rotorgames.com", "Rg.Plugins.Popup.Animations")]
4+
[assembly: XmlnsDefinition("http://rotorgames.com", "Rg.Plugins.Popup.Pages")]
5+
[assembly: XmlnsPrefix("http://rotorgames.com", "rg")]

‎Samples/Demo/Pages/FirstPopupPage.xaml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
xmlns:animations="clr-namespace:Rg.Plugins.Popup.Animations;assembly=Rg.Plugins.Popup"
6-
x:Class="Demo.Pages.FirstPopupPage">
7-
<pages:PopupPage.Animation>
8-
<animations:ScaleAnimation
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
x:Class="Demo.Pages.FirstPopupPage">
6+
<rg:PopupPage.Animation>
7+
<rg:ScaleAnimation
98
PositionIn="Center"
109
PositionOut="Center"
1110
ScaleIn="1.2"
@@ -15,7 +14,7 @@
1514
EasingIn="SinOut"
1615
EasingOut="SinIn"
1716
HasBackgroundAnimation="True"/>
18-
</pages:PopupPage.Animation>
17+
</rg:PopupPage.Animation>
1918
<StackLayout VerticalOptions="Center" HorizontalOptions="FillAndExpand" Padding="20, 20, 20, 20">
2019
<StackLayout BackgroundColor="White" Padding="0, 10, 0, 0">
2120
<Label Text="First Popup Page" TextColor="Gray" FontSize="20" HorizontalOptions="Center"></Label>
@@ -39,4 +38,4 @@
3938
</ScrollView>
4039
</StackLayout>
4140
</StackLayout>
42-
</pages:PopupPage>
41+
</rg:PopupPage>

‎Samples/Demo/Pages/ListViewPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
33
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
4+
xmlns:rg="http://rotorgames.com"
55
x:Class="Demo.Pages.ListViewPage">
66
<StackLayout VerticalOptions="Center" HorizontalOptions="FillAndExpand" Padding="20, 20, 20, 20">
77
<StackLayout BackgroundColor="White">
@@ -15,4 +15,4 @@
1515
</StackLayout>
1616
<Button Text="Close" TextColor="#A9D1DE" Clicked="OnClose"></Button>
1717
</StackLayout>
18-
</pages:PopupPage>
18+
</rg:PopupPage>

‎Samples/Demo/Pages/LoadingPopupPage.xaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
x:Class="Demo.Pages.LoadingPopupPage"
6-
CloseWhenBackgroundIsClicked="False">
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
x:Class="Demo.Pages.LoadingPopupPage"
6+
CloseWhenBackgroundIsClicked="False">
77
<ActivityIndicator
88
Color="White"
99
IsRunning="True"
@@ -12,4 +12,4 @@
1212
HorizontalOptions="Center"
1313
HeightRequest="70"
1414
WidthRequest="70"/>
15-
</pages:PopupPage>
15+
</rg:PopupPage>

‎Samples/Demo/Pages/LoginPopupPage.xaml‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
xmlns:animations="clr-namespace:Rg.Plugins.Popup.Animations;assembly=Rg.Plugins.Popup"
6-
x:Class="Demo.Pages.LoginPopupPage">
7-
<pages:PopupPage.Resources>
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
x:Class="Demo.Pages.LoginPopupPage">
6+
<rg:PopupPage.Resources>
87
<ResourceDictionary>
98
<Style x:Key="EntryStyle" TargetType="Entry">
109
<Setter Property="PlaceholderColor" Value="#9cdaf1"/>
1110
<Setter Property="TextColor" Value="#7dbbe6"/>
1211
</Style>
1312
</ResourceDictionary>
14-
</pages:PopupPage.Resources>
15-
<pages:PopupPage.Animation>
16-
<animations:ScaleAnimation
13+
</rg:PopupPage.Resources>
14+
<rg:PopupPage.Animation>
15+
<rg:ScaleAnimation
1716
PositionIn="Bottom"
1817
PositionOut="Center"
1918
ScaleIn="1"
2019
ScaleOut="0.7"
2120
DurationIn="700"
2221
EasingIn="BounceOut"/>
23-
</pages:PopupPage.Animation>
22+
</rg:PopupPage.Animation>
2423
<ScrollView
2524
HorizontalOptions="Center"
2625
VerticalOptions="Center">
@@ -93,4 +92,4 @@
9392
</ContentView>
9493
</AbsoluteLayout>
9594
</ScrollView>
96-
</pages:PopupPage>
95+
</rg:PopupPage>

‎Samples/Demo/Pages/LoginSuccessPopupPage.xaml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
xmlns:animations="clr-namespace:Rg.Plugins.Popup.Animations;assembly=Rg.Plugins.Popup"
6-
x:Class="Demo.Pages.LoginSuccessPopupPage"
7-
x:Name="ThisPage"
8-
BackgroundColor="Transparent"
9-
BackgroundInputTransparent="True"
10-
HasSystemPadding="False"
11-
CloseWhenBackgroundIsClicked="False">
12-
<pages:PopupPage.Animation>
13-
<animations:MoveAnimation
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
x:Class="Demo.Pages.LoginSuccessPopupPage"
6+
x:Name="ThisPage"
7+
BackgroundColor="Transparent"
8+
BackgroundInputTransparent="True"
9+
HasSystemPadding="False"
10+
CloseWhenBackgroundIsClicked="False">
11+
<rg:PopupPage.Animation>
12+
<rg:MoveAnimation
1413
PositionIn="Top"
1514
PositionOut="Top"/>
16-
</pages:PopupPage.Animation>
15+
</rg:PopupPage.Animation>
1716
<StackLayout
1817
VerticalOptions="Start"
1918
BackgroundColor="#43A047">
@@ -25,4 +24,4 @@
2524
VerticalOptions="EndAndExpand"
2625
Text="Login is success"/>
2726
</StackLayout>
28-
</pages:PopupPage>
27+
</rg:PopupPage>

‎Samples/Demo/Pages/SystemOffsetPage.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
x:Class="Demo.Pages.SystemOffsetPage">
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
x:Class="Demo.Pages.SystemOffsetPage">
66
<ContentView VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand" Padding="5,5,5,5" BackgroundColor="Red">
77
<ContentView BackgroundColor="White" VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
88
<StackLayout VerticalOptions="CenterAndExpand" HorizontalOptions="CenterAndExpand">
@@ -12,4 +12,4 @@
1212
</StackLayout>
1313
</ContentView>
1414
</ContentView>
15-
</pages:PopupPage>
15+
</rg:PopupPage>

‎Samples/Demo/Pages/UserAnimationPage.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8" ?>
2-
<pages:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4-
xmlns:pages="clr-namespace:Rg.Plugins.Popup.Pages;assembly=Rg.Plugins.Popup"
5-
xmlns:animations="clr-namespace:Demo.Animations;assembly=Demo"
6-
x:Class="Demo.Pages.UserAnimationPage">
7-
<pages:PopupPage.Animation>
2+
<rg:PopupPage xmlns="http://xamarin.com/schemas/2014/forms"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
4+
xmlns:rg="http://rotorgames.com"
5+
xmlns:animations="clr-namespace:Demo.Animations;assembly=Demo"
6+
x:Class="Demo.Pages.UserAnimationPage">
7+
<rg:PopupPage.Animation>
88
<animations:UserAnimation/>
9-
</pages:PopupPage.Animation>
9+
</rg:PopupPage.Animation>
1010
<StackLayout VerticalOptions="Center" HorizontalOptions="Center">
1111
<Frame BackgroundColor="Silver">
1212
<StackLayout Spacing="20">
@@ -15,4 +15,4 @@
1515
</StackLayout>
1616
</Frame>
1717
</StackLayout>
18-
</pages:PopupPage>
18+
</rg:PopupPage>

0 commit comments

Comments
 (0)