Fix test

muak · Oct 29, 2018 · 75bcb70 · 75bcb70
1 parent dadcdd0
commit 75bcb70
Show file tree

Hide file tree

Showing 31 changed files with 1,187 additions and 833 deletions.
diff --git a/CollectionView.Droid/CollectionView.Droid.csproj b/CollectionView.Droid/CollectionView.Droid.csproj
@@ -142,7 +142,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CollectionView\CollectionView.csproj">
-      <Project>{6E8E8AAC-E482-4E9C-9759-27B03E4DC309}</Project>
+      <Project>{D5C93D88-A5D6-4843-935B-CC72F073B54E}</Project>
       <Name>CollectionView</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/CollectionView.Droid/GridCollectionViewRenderer.cs b/CollectionView.Droid/GridCollectionViewRenderer.cs
@@ -468,7 +468,7 @@ public override void GetItemOffsets(Android.Graphics.Rect outRect, Android.Views
                     outRect.Right = _parentRenderer.ColumnSpacing - (spanIndex + 1) * _parentRenderer.ColumnSpacing / _spanCount; // spacing - (column + 1) * ((1f /    spanCount) * spacing)
                 }   
 
-                if(position == 0 || _parentRenderer.Adapter.FirstSectionItems.Contains(position)) {
+                if(position  < _spanCount || _parentRenderer.Adapter.FirstSectionItems.Contains(position - spanIndex)) {
                     return;
                 }
 

diff --git a/Sample/Sample.Droid/MainActivity.cs b/Sample/Sample.Droid/MainActivity.cs
@@ -1,5 +1,4 @@
-using AiForms.Extras;
-using Android.App;
+using Android.App;
 using Android.Content.PM;
 using Android.OS;
 using CarouselView.FormsPlugin.Android;
@@ -23,7 +22,7 @@ protected override void OnCreate(Bundle bundle)
             Xamarin.Forms.Svg.Droid.SvgImage.Init();
             FFImageLoading.Forms.Platform.CachedImageRenderer.Init(true);
             CarouselViewRenderer.Init();
-            AiForms.Extras.Extras.Init(this);
+            AiForms.Dialogs.Dialogs.Init(this);
 
 
             LoadApplication(new App(new AndroidInitializer()));
@@ -34,7 +33,7 @@ public class AndroidInitializer : IPlatformInitializer
     {
         public void RegisterTypes(IContainerRegistry containerRegistry)
         {
-            containerRegistry.RegisterInstance(Toast.Instance);
+            containerRegistry.RegisterInstance(AiForms.Dialogs.Toast.Instance);
         }
     }
 }
diff --git a/Sample/Sample.Droid/Sample.Droid.csproj b/Sample/Sample.Droid/Sample.Droid.csproj
@@ -208,11 +208,17 @@
     <Reference Include="Xamarin.Forms.Xaml">
       <HintPath>..\packages\Xamarin.Forms.3.2.0.839982\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Extras.Abstractions">
-      <HintPath>..\packages\AiForms.Extras.0.1.0-pre1\lib\MonoAndroid\AiForms.Extras.Abstractions.dll</HintPath>
+    <Reference Include="SettingsView">
+      <HintPath>..\packages\AiForms.SettingsView.0.3.2\lib\MonoAndroid\SettingsView.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Extras">
-      <HintPath>..\packages\AiForms.Extras.0.1.0-pre1\lib\MonoAndroid\AiForms.Extras.dll</HintPath>
+    <Reference Include="SettingsView.Droid">
+      <HintPath>..\packages\AiForms.SettingsView.0.3.2\lib\MonoAndroid\SettingsView.Droid.dll</HintPath>
+    </Reference>
+    <Reference Include="AiForms.Dialogs.Abstractions">
+      <HintPath>..\packages\AiForms.Dialogs.0.3.2-pre\lib\MonoAndroid\AiForms.Dialogs.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="AiForms.Dialogs">
+      <HintPath>..\packages\AiForms.Dialogs.0.3.2-pre\lib\MonoAndroid\AiForms.Dialogs.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Sample/Sample.Droid/packages.config b/Sample/Sample.Droid/packages.config
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AiForms.Dialogs" version="0.3.2-pre" targetFramework="monoandroid90" />
   <package id="AiForms.Effects" version="1.3.1" targetFramework="monoandroid81" />
-  <package id="AiForms.Extras" version="0.1.0-pre1" targetFramework="monoandroid90" />
   <package id="AiForms.Layouts" version="1.0.4" targetFramework="monoandroid81" />
+  <package id="AiForms.SettingsView" version="0.3.2" targetFramework="monoandroid90" />
   <package id="CarouselView.FormsPlugin" version="5.2.0" targetFramework="monoandroid90" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid71" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid81" />

diff --git a/Sample/Sample.iOS/AppDelegate.cs b/Sample/Sample.iOS/AppDelegate.cs
@@ -5,8 +5,7 @@
 using FFImageLoading.Forms;
 using FFImageLoading.Forms.Touch;
 using CarouselView.FormsPlugin.iOS;
-using AiForms.Extras.Abstractions;
-using AiForms.Extras;
+using AiForms.Dialogs;
 
 namespace Sample.iOS
 {
@@ -29,9 +28,11 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
 
             AiForms.Effects.iOS.Effects.Init();
             AiForms.Renderers.iOS.CollectionViewInit.Init();
+            AiForms.Renderers.iOS.SettingsViewInit.Init();
             Xamarin.Forms.Svg.iOS.SvgImage.Init();
             FFImageLoading.Forms.Platform.CachedImageRenderer.Init();
             CarouselViewRenderer.Init();
+            AiForms.Dialogs.Dialogs.Init();
 
             LoadApplication(new App(new iOSInitializer()));
 

diff --git a/Sample/Sample.iOS/Sample.iOS.csproj b/Sample/Sample.iOS/Sample.iOS.csproj
@@ -181,11 +181,17 @@
     <Reference Include="Xamarin.Forms.Xaml">
       <HintPath>..\packages\Xamarin.Forms.3.2.0.839982\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Extras.Abstractions">
-      <HintPath>..\packages\AiForms.Extras.0.1.0-pre1\lib\Xamarin.iOS10\AiForms.Extras.Abstractions.dll</HintPath>
+    <Reference Include="SettingsView">
+      <HintPath>..\packages\AiForms.SettingsView.0.3.2\lib\Xamarin.iOS10\SettingsView.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Extras">
-      <HintPath>..\packages\AiForms.Extras.0.1.0-pre1\lib\Xamarin.iOS10\AiForms.Extras.dll</HintPath>
+    <Reference Include="SettingsView.iOS">
+      <HintPath>..\packages\AiForms.SettingsView.0.3.2\lib\Xamarin.iOS10\SettingsView.iOS.dll</HintPath>
+    </Reference>
+    <Reference Include="AiForms.Dialogs.Abstractions">
+      <HintPath>..\packages\AiForms.Dialogs.0.3.2-pre\lib\Xamarin.iOS10\AiForms.Dialogs.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="AiForms.Dialogs">
+      <HintPath>..\packages\AiForms.Dialogs.0.3.2-pre\lib\Xamarin.iOS10\AiForms.Dialogs.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Sample/Sample.iOS/packages.config b/Sample/Sample.iOS/packages.config
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="AiForms.Dialogs" version="0.3.2-pre" targetFramework="xamarinios10" />
   <package id="AiForms.Effects" version="1.3.1" targetFramework="xamarinios10" />
-  <package id="AiForms.Extras" version="0.1.0-pre1" targetFramework="xamarinios10" />
   <package id="AiForms.Layouts" version="1.0.4" targetFramework="xamarinios10" />
+  <package id="AiForms.SettingsView" version="0.3.2" targetFramework="xamarinios10" />
   <package id="CarouselView.FormsPlugin" version="5.2.0" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />

diff --git a/Sample/Sample/Sample.csproj b/Sample/Sample/Sample.csproj
@@ -14,12 +14,16 @@
     <PackageReference Include="Xamarin.Forms" Version="3.2.0.839982" />
     <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.4.3.840" />
     <PackageReference Include="CarouselView.FormsPlugin" Version="5.2.0" />
-    <PackageReference Include="AiForms.Extras" Version="0.1.0-pre1" />
+    <PackageReference Include="AiForms.SettingsView" Version="0.3.2" />
+    <PackageReference Include="AiForms.Dialogs" Version="0.3.2-pre" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Views\ButtonCellTest.xaml.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\CollectionView\CollectionView.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="ViewModels\Tests\" />
+  </ItemGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up @@
                         outRect.Right = _parentRenderer.ColumnSpacing - (spanIndex + 1) * _parentRenderer.ColumnSpacing / _spanCount; // spacing - (column + 1) * ((1f /    spanCount) * spacing)
                     }
-                    if(position == 0 || _parentRenderer.Adapter.FirstSectionItems.Contains(position)) {
+                    if(position  < _spanCount || _parentRenderer.Adapter.FirstSectionItems.Contains(position - spanIndex)) {
                         return;
                     }
@@ Expand Down @@