名前の変更

rikupin1105 · Aug 11, 2022 · eb86a4d · eb86a4d
1 parent 3d1760e
commit eb86a4d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/src/SportsCoderForVolleyball/Models/Control.cs b/src/SportsCoderForVolleyball/Models/Control.cs
@@ -145,7 +145,7 @@ private async Task GameSetAsync()
             //セットごとのポイント
             await Task.Delay(4000);
             Instance.Option.InfomationPointParSet();
-            Instance.IsAnimation.Value = false;
+            Instance.IsDisplayScoreboard.Value = false;
 
             //セットごとのポイントを削除
             await Task.Delay(10000);

diff --git a/src/SportsCoderForVolleyball/Models/Data.cs b/src/SportsCoderForVolleyball/Models/Data.cs
@@ -20,7 +20,7 @@ public class Data
         public Control Control { get; set; } = new();
 
         //アニメーション
-        public ReactiveProperty<bool> IsAnimation = new(true);
+        public ReactiveProperty<bool> IsDisplayScoreboard = new(true);
         public ReactiveProperty<bool> IsDisplayTechnicalTimeout = new(false);
         public ReactiveProperty<bool> IsDisplayLeftTimeout = new(false);
         public ReactiveProperty<bool> IsDisplayRightTimeout = new(false);

diff --git a/src/SportsCoderForVolleyball/Models/Option.cs b/src/SportsCoderForVolleyball/Models/Option.cs
@@ -69,9 +69,9 @@ public async void LeftTimeout()
             else
             {
                 Instance.TimeOutLeft.Value++;
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
 
@@ -115,9 +115,9 @@ public async void RightTimeOut()
             else
             {
                 Instance.TimeOutRight.Value++;
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
 
@@ -159,9 +159,9 @@ public async void TechnicalTimeOut()
             }
             else
             {
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
 
@@ -185,7 +185,7 @@ public async void TechnicalTimeOut()
         }
         public async void InfomationScore()
         {
-            if (Instance.IsAnimation.Value)
+            if (Instance.IsDisplayScoreboard.Value)
             {
                 //表示されているとき
                 if (Instance.IsDisplayGetSet.Value)
@@ -195,14 +195,14 @@ public async void InfomationScore()
                 else
                 {
                     await DeleteOption();
-                    Instance.IsAnimation.Value = false;
+                    Instance.IsDisplayScoreboard.Value = false;
                 }
             }
             else
             {
                 //未表示のとき
 
-                Instance.IsAnimation.Value = true;
+                Instance.IsDisplayScoreboard.Value = true;
                 if (Instance.IsDisplayGetSet.Value)
                 {
                     Instance.IsDisplayGetSet.Value = false;
@@ -276,9 +276,9 @@ public async void InfomationAttackPoint()
             }
             else
             {
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
 
@@ -296,9 +296,9 @@ public async void InfomationBlockPoint()
             }
             else
             {
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
                 await DeleteOption();
@@ -315,9 +315,9 @@ public async void InfomationServePoint()
             }
             else
             {
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
                 await DeleteOption();
@@ -334,9 +334,9 @@ public async void InfomationServeError()
             }
             else
             {
-                if (Instance.IsAnimation.Value == false)
+                if (Instance.IsDisplayScoreboard.Value == false)
                 {
-                    Instance.IsAnimation.Value = true;
+                    Instance.IsDisplayScoreboard.Value = true;
                     await Task.Delay(1000);
                 }
                 await DeleteOption();

diff --git a/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs b/src/SportsCoderForVolleyball/ViewModels/ScoreBoardViewModel.cs
@@ -7,7 +7,7 @@ namespace SportsCoderForVolleyball.ViewModels
 {
     public class ScoreBoardViewModel : BindableBase
     {
-        public ReactiveProperty<bool> IsAnimation { get; set; } = Data.Instance.IsAnimation.ObserveProperty(x => x.Value).ToReactiveProperty();
+        public ReactiveProperty<bool> IsDisplayScoreboard { get; set; } = Data.Instance.IsDisplayScoreboard.ObserveProperty(x => x.Value).ToReactiveProperty();
 
         //UI部品
         public ReactiveProperty<int> Set { get; set; } = Data.Instance.Set.ObserveProperty(x => x.Value).ToReactiveProperty();

diff --git a/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml b/src/SportsCoderForVolleyball/Views/ScoreBoard.xaml
@@ -82,7 +82,7 @@
         <Grid.Style>
             <Style TargetType="Grid">
                 <Style.Triggers>
-                    <DataTrigger Binding="{Binding IsAnimation.Value}" Value="True">
+                    <DataTrigger Binding="{Binding IsDisplayScoreboard.Value}" Value="True">
                         <DataTrigger.EnterActions>
                             <BeginStoryboard>
                                 <Storyboard>