Skip to content

2
2018-app-inutralia
Commit 54753559 by Javier Piris
Options

Actualización paquete Rg.Plugins.Popup a la versión 1.1.5.188 + Solucinado fixed… 

Actualización paquete Rg.Plugins.Popup a la versión 1.1.5.188 + Solucinado fixed de error en el popup en la vista de ShoppingList
parent cc742ba2
Showing with 33 additions and 36 deletions
inutralia/inutralia.Droid/MainActivity.cs
...@@ -36,7 +36,10 @@ namespace inutralia ...@@ -36,7 +36,10 @@ namespace inutralia
Window.AddFlags(WindowManagerFlags.Fullscreen); Window.AddFlags(WindowManagerFlags.Fullscreen);
//Initializing FFImageLoading //Initializing Rg Plugins Popup
Rg.Plugins.Popup.Popup.Init(this, bundle);
//Initializing FFImageLoadings
FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true); FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
Forms.Init(this, bundle); Forms.Init(this, bundle);
......
inutralia/inutralia.Droid/inutralia.Droid.csproj
...@@ -87,11 +87,11 @@ ...@@ -87,11 +87,11 @@
<Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath> <HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup, Version=1.1.5.188, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\MonoAndroid\Rg.Plugins.Popup.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.1.5.188\lib\MonoAndroid\Rg.Plugins.Popup.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup.Droid, Version=1.1.5.188, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\MonoAndroid\Rg.Plugins.Popup.Droid.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.1.5.188\lib\MonoAndroid\Rg.Plugins.Popup.Droid.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\MonoAndroid\Rg.Plugins.Popup.Platform.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\MonoAndroid\Rg.Plugins.Popup.Platform.dll</HintPath>
......
inutralia/inutralia.Droid/packages.config
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" /> <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid90" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" /> <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid90" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid90" /> <package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid90" />
<package id="Rg.Plugins.Popup" version="1.1.5.180" targetFramework="monoandroid90" /> <package id="Rg.Plugins.Popup" version="1.1.5.188" targetFramework="monoandroid90" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.Collections" version="4.3.0" targetFramework="monoandroid90" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" /> <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid90" />
......
inutralia/inutralia.iOS/AppDelegate.cs
...@@ -18,6 +18,9 @@ namespace inutralia ...@@ -18,6 +18,9 @@ namespace inutralia
// Initializing FFImageLoading // Initializing FFImageLoading
FFImageLoading.Forms.Platform.CachedImageRenderer.Init(); FFImageLoading.Forms.Platform.CachedImageRenderer.Init();
//Initializing Rg Plugins Popup
Rg.Plugins.Popup.Popup.Init();
//Initializing GrialKit //Initializing GrialKit
GrialKit.Init(new ThemeColors(), "inutralia.GrialLicense"); GrialKit.Init(new ThemeColors(), "inutralia.GrialLicense");
......
inutralia/inutralia.iOS/inutralia.iOS.csproj
...@@ -150,11 +150,11 @@ ...@@ -150,11 +150,11 @@
<Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath> <HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup, Version=1.1.5.188, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\Xamarin.IOS\Rg.Plugins.Popup.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.1.5.188\lib\Xamarin.IOS\Rg.Plugins.Popup.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup.IOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup.IOS, Version=1.1.5.188, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\Xamarin.IOS\Rg.Plugins.Popup.IOS.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.1.5.188\lib\Xamarin.IOS\Rg.Plugins.Popup.IOS.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\Xamarin.IOS\Rg.Plugins.Popup.Platform.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\Xamarin.IOS\Rg.Plugins.Popup.Platform.dll</HintPath>
......
inutralia/inutralia.iOS/packages.config
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" /> <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" /> <package id="NETStandard.Library" version="2.0.3" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" /> <package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" />
<package id="Rg.Plugins.Popup" version="1.1.5.180" targetFramework="xamarinios10" /> <package id="Rg.Plugins.Popup" version="1.1.5.188" targetFramework="xamarinios10" />
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" /> <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="xamarinios10" />
......
inutralia/inutralia/Views/ShoppingList/InfoPopup.xaml
...@@ -7,10 +7,12 @@ ...@@ -7,10 +7,12 @@
xmlns:artina="clr-namespace:UXDivers.Artina.Shared;assembly=UXDivers.Artina.Shared" xmlns:artina="clr-namespace:UXDivers.Artina.Shared;assembly=UXDivers.Artina.Shared"
BackgroundColor="Transparent"> BackgroundColor="Transparent">
<ScrollView>
<pages:PopupPage.Animation> <pages:PopupPage.Animation>
<animations:ScaleAnimation PositionIn="Center" <animations:ScaleAnimation
PositionIn="Center"
PositionOut="Center" PositionOut="Center"
ScaleIn="1.2" ScaleIn="0.8"
ScaleOut="0.8" ScaleOut="0.8"
DurationIn="400" DurationIn="400"
DurationOut="300" DurationOut="300"
...@@ -20,9 +22,7 @@ ...@@ -20,9 +22,7 @@
</pages:PopupPage.Animation> </pages:PopupPage.Animation>
<StackLayout VerticalOptions="Center" Padding="20,0" HorizontalOptions="FillAndExpand" > <StackLayout VerticalOptions="Center" Padding="20,0" HorizontalOptions="FillAndExpand" >
<Frame CornerRadius="10" Padding="0" BackgroundColor="{DynamicResource AccentColor}" > <Frame CornerRadius="10" Padding="0" BackgroundColor="{DynamicResource AccentColor}" >
<StackLayout Padding="10"> <StackLayout Padding="10">
<Label Text="COMO SE UTILIZA LA LISTA DE LA COMPRA" TextColor="White" HorizontalOptions="Start"/> <Label Text="COMO SE UTILIZA LA LISTA DE LA COMPRA" TextColor="White" HorizontalOptions="Start"/>
<Label Text="La lista de la compra mostrará por defecto los ingredientes a utilizar por orden alfabético." TextColor="#333333" FontSize="Small" HorizontalOptions="CenterAndExpand"></Label> <Label Text="La lista de la compra mostrará por defecto los ingredientes a utilizar por orden alfabético." TextColor="#333333" FontSize="Small" HorizontalOptions="CenterAndExpand"></Label>
...@@ -48,4 +48,5 @@ ...@@ -48,4 +48,5 @@
</StackLayout> </StackLayout>
</Frame> </Frame>
</StackLayout> </StackLayout>
</ScrollView>
</pages:PopupPage> </pages:PopupPage>
inutralia/inutralia/Views/ShoppingList/InfoPopup.xaml.cs
namespace inutralia.Views.ShoppingList namespace inutralia.Views.ShoppingList
{ {
using Rg.Plugins.Popup.Pages; using Rg.Plugins.Popup.Pages;
using Rg.Plugins.Popup.Services;
using System; using System;
using Xamarin.Forms.Xaml; using Xamarin.Forms.Xaml;
...@@ -11,11 +10,12 @@ ...@@ -11,11 +10,12 @@
public InfoPopup() public InfoPopup()
{ {
InitializeComponent(); InitializeComponent();
CloseWhenBackgroundIsClicked = false;
} }
private async void Button_Clicked(object sender, EventArgs e) private async void Button_Clicked(object sender, EventArgs e)
{ {
await PopupNavigation.PopAsync(true); await Navigation.PopToRootAsync();
} }
} }
} }
\ No newline at end of file
inutralia/inutralia/Views/ShoppingList/ShoppingListView.xaml
...@@ -28,20 +28,7 @@ ...@@ -28,20 +28,7 @@
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <SwitchCell Text="{Binding Text}" On="{Binding Select}"/>
<Grid Margin="0,10,0,10" VerticalOptions="CenterAndExpand">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackLayout >
<Label Text="{Binding Text}" FontSize="Medium"/>
</StackLayout>
<Switch IsToggled="{Binding Select}" Grid.Column="1" />
</Grid>
</ViewCell>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
......
inutralia/inutralia/Views/ShoppingList/ShoppingListView.xaml.cs
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{ {
using inutralia.ViewModels; using inutralia.ViewModels;
using inutralia.Views.ShoppingList; using inutralia.Views.ShoppingList;
using Rg.Plugins.Popup.Services;
using System; using System;
using Xamarin.Forms; using Xamarin.Forms;
...@@ -27,7 +26,10 @@ ...@@ -27,7 +26,10 @@
((ListView)sender).SelectedItem = null; ((ListView)sender).SelectedItem = null;
} }
private async void InfoButtonClicked(object sender, EventArgs e) => await PopupNavigation.PushAsync(new InfoPopup()); private async void InfoButtonClicked(object sender, EventArgs e)
{
await Navigation.PushAsync(new InfoPopup());
}
async void OnAddButtonClicked(object sender, EventArgs e) async void OnAddButtonClicked(object sender, EventArgs e)
{ {
......
inutralia/inutralia/inutralia.csproj
...@@ -409,8 +409,8 @@ ...@@ -409,8 +409,8 @@
<Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Plugin.Settings.Abstractions, Version=2.5.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll</HintPath> <HintPath>..\packages\Xam.Plugins.Settings.2.5.8\lib\portable-net45+wp80+win8+wpa81\Plugin.Settings.Abstractions.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup, Version=1.1.5.188, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\portable-win+net45+wp8+win8+wpa81\Rg.Plugins.Popup.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.1.5.188\lib\netstandard1.0\Rg.Plugins.Popup.dll</HintPath>
</Reference> </Reference>
<Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Rg.Plugins.Popup.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\portable-win+net45+wp8+win8+wpa81\Rg.Plugins.Popup.Platform.dll</HintPath> <HintPath>..\packages\Rg.Plugins.Popup.1.0.4\lib\portable-win+net45+wp8+win8+wpa81\Rg.Plugins.Popup.Platform.dll</HintPath>
......
inutralia/inutralia/packages.config
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<package id="NETStandard.Library" version="2.0.3" targetFramework="portable45-net45+win8+wp8" /> <package id="NETStandard.Library" version="2.0.3" targetFramework="portable45-net45+win8+wp8" />
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="portable45-net45+win8+wp8" /> <package id="Newtonsoft.Json" version="12.0.1" targetFramework="portable45-net45+win8+wp8" />
<package id="Refractored.MvvmHelpers" version="1.3.0" targetFramework="portable45-net45+win8+wp8" /> <package id="Refractored.MvvmHelpers" version="1.3.0" targetFramework="portable45-net45+win8+wp8" />
<package id="Rg.Plugins.Popup" version="1.1.5.180" targetFramework="portable45-net45+win8+wp8" /> <package id="Rg.Plugins.Popup" version="1.1.5.188" targetFramework="portable45-net45+win8+wp8" />
<package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8" /> <package id="System.Collections" version="4.3.0" targetFramework="portable45-net45+win8+wp8" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wp8" /> <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="portable45-net45+win8+wp8" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wp8" /> <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="portable45-net45+win8+wp8" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment