Merge branch 'release/1.1.0-beta2'

twinkle-tools · Apr 30, 2020 · e024fed · e024fed
2 parents 7b084e9 + 69553a9
commit e024fed
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -46,11 +46,6 @@ public class MainGooglePage:View
 ```
 public class TextBox:Control
 {
-    public TextBox(string alias, string xpath, string css, TwinkleView twinkleView) : base(alias, xpath, css, twinkleView)
-    {
-
-    }
-
     [Operation(Alias = "SetValue")]
     public void SetValue(string value)
     {
@@ -79,11 +74,6 @@ public class TextBox:Control
 ```
 public class Button:Control
 {
-    public Button(string alias, string xpath, string css, TwinkleView twinkleView) : base(alias, xpath, css, twinkleView)
-    {
-
-    }
-
     [Operation(Alias = "Click")]
     public void Click()
     {

diff --git a/Twinkle.View/TwinkleView.cs b/Twinkle.View/TwinkleView.cs
@@ -57,6 +57,18 @@ public static void DefiniteActiveViews()
             var targetFramework = ThreadsManager.GetTargetFramework();
             targetFramework.GetActiveViews();
         }
+
+        public static Dictionary<Type, object> GetActiveViews()
+        {
+            var targetFramework = ThreadsManager.GetTargetFramework();
+            return targetFramework.SystemContext.Views.ActiveViews;
+        }
+
+        public static Dictionary<Type, object> GetAllViews()
+        {
+            var targetFramework = ThreadsManager.GetTargetFramework();
+            return targetFramework.SystemContext.Views.AllViews;
+        }
 
         //todo переделать
         public static void ExportDefiniteActiveViews()

diff --git a/Twinkle.View/View.nuspec b/Twinkle.View/View.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>Twinkle.View</id>
-        <version>1.1.0-beta1</version>
+        <version>1.1.0-beta2</version>
         <authors>Twinkle</authors>
         <owners>Twinkle</owners>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>