Merge pull request #3 from BaseflowIT/develop

Merge from remote

Author: Miiite

Samples/MaterialMvvmSample.Android/MainActivity.cs

@@ -14,6 +14,7 @@ protected override void OnCreate(Bundle savedInstanceState)
             ToolbarResource = Resource.Layout.Toolbar;
 
             base.OnCreate(savedInstanceState);
+            Rg.Plugins.Popup.Popup.Init(this, savedInstanceState);
             Xamarin.Forms.Forms.Init(this, savedInstanceState);
             Material.Init(this, savedInstanceState);
 

Samples/MaterialMvvmSample.Android/MaterialMvvmSample.Android.csproj

@@ -62,6 +62,9 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.2.0.815419</Version>
     </PackageReference>
+    <PackageReference Include="Rg.Plugins.Popup">
+      <Version>1.2.0.223</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Core\PlatformContainer.cs" />

Samples/MaterialMvvmSample.Core/AppContainer.cs

@@ -6,6 +6,7 @@
 using MaterialMvvmSample.ViewModels;
 using MaterialMvvmSample.Views;
 using Xamarin.Forms;
+using XF.Material.Forms.UI;
 
 namespace MaterialMvvmSample.Core
 {
@@ -36,6 +37,10 @@ protected virtual void RegisterServices(ContainerBuilder containerBuilder)
             containerBuilder.RegisterType<SecondView>().Named<Page>(ViewNames.SecondView).As<SecondView>().InstancePerDependency();
 
             containerBuilder.RegisterType<LandingView>().Named<Page>(ViewNames.LandingView).As<LandingView>().InstancePerDependency();
+            containerBuilder.RegisterType<MaterialDialogsView>().Named<Page>(ViewNames.MaterialDialogsView).As<MaterialDialogsView>().InstancePerDependency();
+            containerBuilder.RegisterType<CheckboxesView>().Named<Page>(ViewNames.CheckboxesView).As<CheckboxesView>().InstancePerDependency();
+
+
 
             containerBuilder.RegisterType<MainViewModel>().InstancePerDependency();
             containerBuilder.RegisterType<SecondViewModel>().InstancePerDependency();

Samples/MaterialMvvmSample.iOS/AppDelegate.cs

@@ -9,6 +9,7 @@ public partial class AppDelegate : Xamarin.Forms.Platform.iOS.FormsApplicationDe
     {
         public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary launchOptions)
         {
+            Rg.Plugins.Popup.Popup.Init();
             Xamarin.Forms.Forms.Init();
             XF.Material.iOS.Material.Init();
 

Samples/MaterialMvvmSample.iOS/MaterialMvvmSample.iOS.csproj

@@ -171,6 +171,9 @@
     <PackageReference Include="Xamarin.Forms">
       <Version>4.2.0.815419</Version>
     </PackageReference>
+    <PackageReference Include="Rg.Plugins.Popup">
+      <Version>1.2.0.223</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

Samples/MaterialMvvmSample/MaterialMvvmSample.csproj

@@ -13,14 +13,15 @@
     <PackageReference Include="Autofac" Version="4.9.4" />
     <PackageReference Include="Autofac.Extras.CommonServiceLocator" Version="5.0.0" />
     <PackageReference Include="Xamarin.Forms" Version="4.2.0.815419" />
+    <PackageReference Include="Rg.Plugins.Popup" Version="1.2.0.223" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\XF.Material\XF.Material.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
+     <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
   </ItemGroup>
 
 </Project>

Samples/MaterialMvvmSample/ViewModels/LandingViewModel.cs

@@ -7,11 +7,13 @@ namespace MaterialMvvmSample.ViewModels
 {
     public class LandingViewModel : BaseViewModel
     {
-        public LandingViewModel()
-        {
+        public ICommand GoToMaterialDialogsCommand => this.GoToCommand(ViewNames.MaterialDialogsView);
 
-        }
+        public ICommand GoToChipFontSizeViewCommand => this.GoToCommand(ViewNames.ChipFontSizeView);
 
-        public ICommand GoToChipFontSizeViewCommand => new Command(() => this.Navigation.PushAsync(ViewNames.ChipFontSizeView));
+        public ICommand GoToCheckboxesSampleCommand => this.GoToCommand(ViewNames.CheckboxesView);
+
+
+        private ICommand GoToCommand(string name) => new Command(() => this.Navigation.PushAsync(name));
     }
 }

Samples/MaterialMvvmSample/Views/CheckboxesView.xaml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             xmlns:local="clr-namespace:MaterialMvvmSample.Views"
+             xmlns:material="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material"
+             x:Class="MaterialMvvmSample.Views.CheckboxesView">
+    <ContentPage.Content>
+        <StackLayout Orientation="Vertical">
+            <material:MaterialCheckbox Text="My Material Checkbox" />
+        </StackLayout>
+    </ContentPage.Content>
+</ContentPage>

Samples/MaterialMvvmSample/Views/CheckboxesView.xaml.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace MaterialMvvmSample.Views
+{
+    public partial class CheckboxesView : ContentPage
+    {
+        public CheckboxesView()
+        {
+            InitializeComponent();
+        }
+    }
+}

Samples/MaterialMvvmSample/Views/LandingView.xaml

@@ -11,6 +11,14 @@
                                      Command="{Binding GoToChipFontSizeViewCommand}"
                                      Margin="10" />
 
+            <material:MaterialButton Text="Go To Material Dialogs sample"
+                                     Command="{Binding GoToMaterialDialogsCommand}"
+                                     Margin="10" />
+
+            <material:MaterialButton Text="Go To Checkboxes sample"
+                                     Command="{Binding GoToCheckboxesSampleCommand}"
+                                     Margin="10" />
+
             <!-- New sample shortcuts should be added here (Button + Associated command in the LandingViewModel) -->
         </StackLayout>
     </ContentPage.Content>

Samples/MaterialMvvmSample/Views/MaterialDialogsView.xaml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<local:BaseMainView xmlns="http://xamarin.com/schemas/2014/forms"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+                    xmlns:local="clr-namespace:MaterialMvvmSample.Views"
+                    xmlns:material="clr-namespace:XF.Material.Forms.UI;assembly=XF.Material"
+                    x:Class="MaterialMvvmSample.Views.MaterialDialogsView">
+    <ContentPage.Content>
+        <StackLayout Orientation="Vertical">
+            <material:MaterialButton Text="Open Dialog"
+                                     x:Name="Opendialog" />
+
+            <material:MaterialLabel x:Name="DialogResult" />
+
+        </StackLayout>
+    </ContentPage.Content>
+</local:BaseMainView>

Samples/MaterialMvvmSample/Views/MaterialDialogsView.xaml.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+using XF.Material.Forms.UI.Dialogs;
+
+namespace MaterialMvvmSample.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class MaterialDialogsView : BaseMainView
+    {
+        public MaterialDialogsView()
+        {
+            InitializeComponent();
+
+            this.Opendialog.Clicked += Opendialog_Clicked;
+        }
+
+        private async void Opendialog_Clicked(object sender, EventArgs e)
+        {
+            var choices = new List<string>
+            {
+                "choice 1",
+                "choice 2",
+                "choice 3",
+            };
+
+            var choice = await MaterialDialog.Instance.SelectChoiceAsync("Select choices", choices);
+
+            this.DialogResult.Text = choices[choice];
+        }
+    }
+}

Samples/MaterialMvvmSample/Views/ViewNames.cs

@@ -10,5 +10,9 @@ public static class ViewNames
 
         public const string LandingView = nameof(Views.LandingView);
 
+        public const string MaterialDialogsView = nameof(Views.MaterialDialogsView);
+
+        public const string CheckboxesView = nameof(Views.CheckboxesView);
+
     }
 }