From 66aa676461239daf071b9ed36f818c206aa4c01f Mon Sep 17 00:00:00 2001
From: kamu <kamuxxx@hotmail.com>
Date: Mon, 25 Dec 2017 19:47:04 +0900
Subject: [PATCH] fixed AddCommand

---
 .../AddCommandPlatformEffect.cs               | 20 +++++--------
 AiForms.Effects/AiForms.Effects.nuget.props   |  6 ++--
 README.md                                     |  4 +--
 .../AiEffects.TestApp.Droid.csproj            | 14 +++++----
 .../AiEffects.TestApp.Droid/packages.config   |  1 -
 .../AiEffects.TestApp.iOS.csproj              | 14 +++++----
 .../AiEffects.TestApp.iOS/packages.config     |  1 -
 .../AiEffects.TestApp.csproj                  | 14 +++++++++
 .../AiEffects.TestApp.nuget.props             |  6 ++--
 .../ViewModels/ViewCellPageViewModel.cs       | 23 +++++++++++++++
 .../AiEffects.TestApp/Views/MainPage.xaml     |  5 ++++
 .../AiEffects.TestApp/Views/ViewCellPage.xaml | 29 +++++++++++++++++++
 .../Views/ViewCellPage.xaml.cs                | 15 ++++++++++
 .../AiEffects.TestApp/project.json            |  1 -
 nuget/AiEffects_mac.nuspec                    | 14 ++-------
 15 files changed, 120 insertions(+), 47 deletions(-)
 create mode 100644 Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ViewCellPageViewModel.cs
 create mode 100644 Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml
 create mode 100644 Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml.cs

diff --git a/AiForms.Effects.Droid/AddCommandPlatformEffect.cs b/AiForms.Effects.Droid/AddCommandPlatformEffect.cs
index 013205e..362dcdc 100644
--- a/AiForms.Effects.Droid/AddCommandPlatformEffect.cs
+++ b/AiForms.Effects.Droid/AddCommandPlatformEffect.cs
@@ -96,8 +96,6 @@ protected override void OnAttached()
             _view.Touch += _view_Touch;
 
             UpdateEnableRipple();
-
-
         }
 
         protected override void OnDetached()
@@ -300,12 +298,13 @@ void UpdateLongCommandParameter()
 
         void UpdateEffectColor()
         {
-            var color = AddCommand.GetEffectColor(Element);
-            if (color == Xamarin.Forms.Color.Default) {
-                return;
-            }
-
-            if (_useRipple) {
+            if (_useRipple)
+            {
+                var color = AddCommand.GetEffectColor(Element);
+                if (color == Xamarin.Forms.Color.Default) {
+                    color = Xamarin.Forms.Color.Accent;
+                }
+           
                 _ripple?.SetColor(getPressedColorSelector(color.ToAndroid()));
             }
 
@@ -315,11 +314,6 @@ void UpdateEnableRipple()
         {
             _useRipple = AddCommand.GetEnableRipple(Element);
 
-            var color = AddCommand.GetEffectColor(Element);
-            if (color == Xamarin.Forms.Color.Default) {
-                return;
-            }
-
             if (_useRipple) {
                 AddRipple();
             }
diff --git a/AiForms.Effects/AiForms.Effects.nuget.props b/AiForms.Effects/AiForms.Effects.nuget.props
index 3f45c91..8e76ca5 100644
--- a/AiForms.Effects/AiForms.Effects.nuget.props
+++ b/AiForms.Effects/AiForms.Effects.nuget.props
@@ -3,9 +3,9 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/kamu/Projects/AiForms.Effects/AiForms.Effects/project.lock.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/kamu/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/kamu/.nuget/packages/</NuGetPackageFolders>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/kamusoft/Projects/AiForms.Effects/AiForms.Effects/project.lock.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/kamusoft/.nuget/packages/</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/kamusoft/.nuget/packages/</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.3.1</NuGetToolVersion>
   </PropertyGroup>
diff --git a/README.md b/README.md
index ebb45cd..570d694 100644
--- a/README.md
+++ b/README.md
@@ -307,10 +307,10 @@ There are properties of Command and Parameter for tap and long tap.
 * LongCommandParameter
     * Long Tap Command Parameter
 * EffectColor
-    * background color when to tap.if it doesn't setting,nothing will occur.
+    * background color when to tap. if it doesn't setting,nothing will occur.
 * EnableRipple
     * Ripple Effect On/Off (default true,android only)<br>
-      If you don't have to use ripple effect,it make EnableRipple false.
+      If you don't have to use ripple effect, it make EnableRipple false.
 * EnableSound
     * When tapped, whether play system sound effect.(Default false)
 * SyncCanExecute
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj
index 45cc2c4..89774a9 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/AiEffects.TestApp.Droid.csproj
@@ -146,12 +146,6 @@
     <Reference Include="ReactiveProperty">
       <HintPath>..\..\..\packages\ReactiveProperty.3.6.0\lib\MonoAndroid\ReactiveProperty.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Effects">
-      <HintPath>..\..\..\packages\AiForms.Effects.1.1.1\lib\MonoAndroid\AiForms.Effects.dll</HintPath>
-    </Reference>
-    <Reference Include="AiForms.Effects.Droid">
-      <HintPath>..\..\..\packages\AiForms.Effects.1.1.1\lib\MonoAndroid\AiForms.Effects.Droid.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AiEffects.Sample\AiEffects.Sample.csproj">
@@ -162,6 +156,14 @@
       <Project>{02E2C54E-9A67-4255-BACC-C035A5529716}</Project>
       <Name>AiEffects.TestApp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AiForms.Effects\AiForms.Effects.csproj">
+      <Project>{14FCC004-FC52-4028-A5AE-228AFD6F6222}</Project>
+      <Name>AiForms.Effects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\AiForms.Effects.Droid\AiForms.Effects.Droid.csproj">
+      <Project>{49FC4DB1-A6EB-4670-A3A3-16E877E39D0C}</Project>
+      <Name>AiForms.Effects.Droid</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config
index 5dab7e2..3b65884 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.Droid/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AiForms.Effects" version="1.1.1" targetFramework="monoandroid80" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="monoandroid70" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid80" />
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid80" />
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj
index 74653f5..9cdc3aa 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/AiEffects.TestApp.iOS.csproj
@@ -138,12 +138,6 @@
     <Reference Include="ReactiveProperty.iOS">
       <HintPath>..\..\..\packages\ReactiveProperty.3.6.0\lib\Xamarin.iOS10\ReactiveProperty.iOS.dll</HintPath>
     </Reference>
-    <Reference Include="AiForms.Effects">
-      <HintPath>..\..\..\packages\AiForms.Effects.1.1.1\lib\Xamarin.iOS10\AiForms.Effects.dll</HintPath>
-    </Reference>
-    <Reference Include="AiForms.Effects.iOS">
-      <HintPath>..\..\..\packages\AiForms.Effects.1.1.1\lib\Xamarin.iOS10\AiForms.Effects.iOS.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AiEffects.Sample\AiEffects.Sample.csproj">
@@ -154,6 +148,14 @@
       <Project>{02E2C54E-9A67-4255-BACC-C035A5529716}</Project>
       <Name>AiEffects.TestApp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\AiForms.Effects\AiForms.Effects.csproj">
+      <Project>{14FCC004-FC52-4028-A5AE-228AFD6F6222}</Project>
+      <Name>AiForms.Effects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\AiForms.Effects.iOS\AiForms.Effects.iOS.csproj">
+      <Project>{7E1357E0-74E7-4FBF-B2AB-052C6A175A9F}</Project>
+      <Name>AiForms.Effects.iOS</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json" />
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config
index 21e22d3..3d7d259 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp.iOS/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AiForms.Effects" version="1.1.1" targetFramework="xamarinios10" />
   <package id="CommonServiceLocator" version="1.3" targetFramework="xamarinios10" />
   <package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
   <package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj
index 34febd2..6c04eb9 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.csproj
@@ -80,6 +80,10 @@
       <DependentUpon>SizeToFitPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\SizeToFitPageViewModel.cs" />
+    <Compile Include="Views\ViewCellPage.xaml.cs">
+      <DependentUpon>ViewCellPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ViewModels\ViewCellPageViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="App.xaml">
@@ -122,6 +126,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="Views\ViewCellPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Practices.ServiceLocation">
@@ -134,5 +142,11 @@
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\AiForms.Effects\AiForms.Effects.csproj">
+      <Project>{14FCC004-FC52-4028-A5AE-228AFD6F6222}</Project>
+      <Name>AiForms.Effects</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
 </Project>
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props
index 2e859dc..ec63790 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/AiEffects.TestApp.nuget.props
@@ -3,9 +3,9 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/kamu/Projects/AiForms.Effects/Tests/AiEffects.TestApp/AiEffects.TestApp/project.lock.json</ProjectAssetsFile>
-    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/kamu/.nuget/packages/</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/kamu/.nuget/packages/</NuGetPackageFolders>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/Users/kamusoft/Projects/AiForms.Effects/Tests/AiEffects.TestApp/AiEffects.TestApp/project.lock.json</ProjectAssetsFile>
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/kamusoft/.nuget/packages/</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/kamusoft/.nuget/packages/</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.3.1</NuGetToolVersion>
   </PropertyGroup>
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ViewCellPageViewModel.cs b/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ViewCellPageViewModel.cs
new file mode 100644
index 0000000..1623c3f
--- /dev/null
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ViewCellPageViewModel.cs
@@ -0,0 +1,23 @@
+using System;
+using Reactive.Bindings;
+using Prism.Services;
+using System.Collections.ObjectModel;
+namespace AiEffects.TestApp.ViewModels
+{
+    public class ViewCellPageViewModel
+    {
+        public ReactiveCommand TestCommand { get; } = new ReactiveCommand();
+        public ObservableCollection<string> ItemsSource { get; } = new ObservableCollection<string>();
+
+        public ViewCellPageViewModel(IPageDialogService pageDlg)
+        {
+            for (var i = 0; i < 20;i++){
+                ItemsSource.Add("Name");
+            }
+
+            TestCommand.Subscribe(async _=>{
+                await pageDlg.DisplayAlertAsync("", "Tap", "OK");
+            });
+        }
+    }
+}
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/MainPage.xaml b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/MainPage.xaml
index da9777a..e22bdef 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/MainPage.xaml
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/MainPage.xaml
@@ -23,6 +23,11 @@
 	</ContentPage.Resources>
 	<ScrollView>
 	<StackLayout Spacing="4" Padding="4">
+        <Label Text="ViewCell" HorizontalOptions="Center" />
+        <StackLayout Orientation="Horizontal">
+            <Button AutomationId="ViewCell" Text="ViewCell" 
+                Command="{Binding GotoTestCommand}" CommandParameter="ViewCellPage" />
+        </StackLayout>
 		<Label Text="AddCommand" HorizontalOptions="Center" />
 		<StackLayout Orientation="Horizontal">
 			<Button AutomationId="AddCommandTapTest" Text="Tap" 
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml
new file mode 100644
index 0000000..e7cdefd
--- /dev/null
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml
@@ -0,0 +1,29 @@
+<?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:ef="clr-namespace:AiForms.Effects;assembly=AiForms.Effects"
+    x:Class="AiEffects.TestApp.Views.ViewCellPage">
+    <StackLayout Orientation="Vertical">
+        <ContentView BackgroundColor="Red" HeightRequest="30" VerticalOptions="Start"
+              ef:AddCommand.On="true"  
+                
+                ef:AddCommand.Command="{Binding TestCommand}"
+
+                        />
+    	<ListView ItemsSource="{Binding ItemsSource}" x:Name="listview" VerticalOptions="FillAndExpand">
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <ViewCell>
+                        <StackLayout Orientation="Horizontal">
+                            <Label Text="{Binding}" HorizontalOptions="StartAndExpand" />
+                            <ContentView BackgroundColor="Red" HorizontalOptions="End" WidthRequest="30" HeightRequest="30"
+                                ef:AddCommand.On="true" ef:AddCommand.Command="{Binding BindingContext.TestCommand,Source={x:Reference listview}}" ef:AddCommand.EnableRipple="true"
+                            />
+                        </StackLayout> 
+                    </ViewCell>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+    </StackLayout>
+</ContentPage>
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml.cs b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml.cs
new file mode 100644
index 0000000..b5bca33
--- /dev/null
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ViewCellPage.xaml.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace AiEffects.TestApp.Views
+{
+    public partial class ViewCellPage : ContentPage
+    {
+        public ViewCellPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/project.json b/Tests/AiEffects.TestApp/AiEffects.TestApp/project.json
index 8a2fd21..b3cb226 100644
--- a/Tests/AiEffects.TestApp/AiEffects.TestApp/project.json
+++ b/Tests/AiEffects.TestApp/AiEffects.TestApp/project.json
@@ -1,6 +1,5 @@
 {
   "dependencies": {
-    "AiForms.Effects": "1.1.1",
     "CommonServiceLocator": "1.3",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
     "NETStandard.Library": "1.6.0",
diff --git a/nuget/AiEffects_mac.nuspec b/nuget/AiEffects_mac.nuspec
index 8ab3ff2..5ab51a7 100644
--- a/nuget/AiEffects_mac.nuspec
+++ b/nuget/AiEffects_mac.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>AiForms.Effects</id>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
         <title>AiForms.Effects for Xamarin.Forms</title>
         <authors>kamu</authors>
         <owners>kamu</owners>
@@ -12,17 +12,9 @@
         <description>Xamarin.Forms Effects(add Border / add placeholder / add Text / add Command / add NumberPicker, TimePicker and DatePicker / alter color for switch and slider / alter LineHeight of Label and Editor / Button to flat / Size to fit for Label) for iOS/Android</description>
         <summary></summary>
         <releaseNotes>
-## Notes
+## Bug fix
 
-Corresponded to Xamarin.Forms 2.5.0 And .NetStandard1.4
-
-## New Feature
-
-* SizeToFit ... Make font size adjusted to fit the Label size.
-
-## Obsoleted
-
-[AddCommand][Android] Done away with the simple effect that is invoked when EnableRipple is false.
+* [AddCommand] Isn't executed command when EffectColor is default value on Android.
         </releaseNotes>
         <tags>Xamarin.Forms Effects Command NumberPikcer LineHeight LineSpacing FlatButton Validation SoundEffect Border TimePicker DatePicker Placeholder Color SizeToFit</tags>
         <language>en-US</language>