Merge pull request #57 from muak/development

Fix SyncCanExecute #53
muak · Feb 4, 2020 · 8d133ec · 8d133ec
2 parents d2360c3 + 33b994f
commit 8d133ec
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 33 deletions.
diff --git a/AiForms.Effects.Droid/AddCommandPlatformEffect.cs b/AiForms.Effects.Droid/AddCommandPlatformEffect.cs
@@ -58,12 +58,13 @@ protected override void OnAttachedOverride()
 
             _view.Clickable = true;
             _view.LongClickable = true;
-
+                        
             UpdateSyncCanExecute();
             UpdateCommandParameter();
             UpdateLongCommandParameter();
+            UpdateIsEnabled();
 
-            _view.Touch += _view_Touch;
+            _view.Touch += _view_Touch;            
         }
 
         protected override void OnDetachedOverride()

diff --git a/AiForms.Effects.Droid/FeedbackPlatformEffect.cs b/AiForms.Effects.Droid/FeedbackPlatformEffect.cs
@@ -180,7 +180,7 @@ void UpdateEnableSound()
             _enableSound = GetEnableSound();
         }
 
-        void UpdateIsEnabled()
+        protected void UpdateIsEnabled()
         {
             if(!IsClickable)
             {

diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ForInvestigationViewModel.cs b/Tests/AiEffects.TestApp/AiEffects.TestApp/ViewModels/ForInvestigationViewModel.cs
@@ -10,37 +10,27 @@ namespace AiEffects.TestApp.ViewModels
     public class ForInvestigationViewModel
     {
         public ReactivePropertySlim<Color> BackColor { get; } = new ReactivePropertySlim<Color>();
-        public List<string> ItemsSource { get; set; } = new List<string>();
-
+
         public ReactiveCommand GoCommand { get; set; } = new ReactiveCommand();
 
-        public ReactiveCommand CellCommand { get; set; } = new ReactiveCommand();
+        public ReactiveCommand HogeCommand { get; set; } 
+
+        public ReactivePropertySlim<bool> CanExecute { get; } = new ReactivePropertySlim<bool>();
 
         public ForInvestigationViewModel(INavigationService navigationService)
         {
             BackColor.Value = Color.Blue;
-
-            ItemsSource.Add("ABC");
-            ItemsSource.Add("CC");
-            ItemsSource.Add("DD");
-            ItemsSource.Add("EEE");
-            ItemsSource.Add("FFF");
-            ItemsSource.Add("GADSFS");
-            ItemsSource.Add("HDSGDG");
-            ItemsSource.Add("IGDG");
-            ItemsSource.Add("YYUY");
-            ItemsSource.Add("XXX");
+
 
             var toggle = false;
             GoCommand.Subscribe(async _ =>
             {
-                //BackColor.Value = toggle ? Color.Blue : Color.Green;
-                //toggle = !toggle;
-                //await navigationService.NavigateAsync("MainPage",null,true);
-                await navigationService.GoBackAsync();
+                CanExecute.Value = !CanExecute.Value;
             });
 
-            CellCommand.Subscribe(_ =>
+            HogeCommand = CanExecute.ToReactiveCommand();
+
+            HogeCommand.Subscribe(_ =>
             {
                 Debug.WriteLine("Cell Tap!");
             });

diff --git a/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ForInvestigation.xaml b/Tests/AiEffects.TestApp/AiEffects.TestApp/Views/ForInvestigation.xaml
@@ -7,17 +7,13 @@
     x:Name="me">
 
     <ContentPage.ToolbarItems>
-        <ToolbarItem Text="Go" Clicked="ToolbarItem_Clicked" />
+        <ToolbarItem Text="Go" Command="{Binding GoCommand}" />
     </ContentPage.ToolbarItems>
 
-    <CollectionView ItemsSource="{Binding ItemsSource}">
-        <CollectionView.ItemsLayout>
-            <LinearItemsLayout Orientation="Vertical" ItemSpacing="1" />
-        </CollectionView.ItemsLayout>
-        <CollectionView.ItemTemplate>
-            <DataTemplate>
-                <Label Text="{Binding}" ef:AddCommand.Command="{Binding BindingContext.CellCommand,Source={x:Reference me}}" />
-            </DataTemplate>
-        </CollectionView.ItemTemplate>
-    </CollectionView>
+    <ContentView ef:AddCommand.Command="{Binding HogeCommand}"
+                 ef:AddCommand.EffectColor="Red"
+                 ef:AddCommand.SyncCanExecute="True"
+                 BackgroundColor="Blue">
+        <Label Text="Hoge" />
+    </ContentView>
 </ContentPage>
diff --git a/nuget/AzurePipelines.nuspec b/nuget/AzurePipelines.nuspec
@@ -19,6 +19,7 @@
 
 ## Bug fixes
 
+* AddCommand – Fixed AddCommand.SyncCanExecute does not work on Android #53
 * Android – Fixed null exception when popping a page. #54
 * AddText – Fixed the end of characters is sometimes omitted #48.
 * Feedback – Fixed Android OnOverlayTouch crash #49.