Skip to content

Commit bee270a

Browse files
authored
release_1.1 (#1)
* Added helper text on the screen view * Added so you can right click a node to view it in node details * Fixed deleting of UI Node * Fixed the With-dialog so you can see all node attributes * Fixed so you can select single cells in all grids
1 parent 4c5d748 commit bee270a

29 files changed

+330
-364
lines changed

src/Testura.Android.PageObjectCreator/App.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
1919
<converters:BooleanToVisibilityInvertedConverter x:Key="BooleanToVisibilityInvertedConverter" />
2020
<converters:InvertBooleanConverter x:Key="InvertBoolConverter" />
21+
<converters:NodeToHierarchyTextConverter x:Key="NodeToHierarchyTextConverter" />
2122
<system:Double x:Key="TabItemFontSize">16</system:Double>
2223
<Thickness x:Key="ControlMargin">10</Thickness>
2324
<BitmapImage x:Key="MainIcon"

src/Testura.Android.PageObjectCreator/Dialogs/NameDialog.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<StackPanel Margin="10">
2121
<StackPanel Orientation="Horizontal">
2222
<Label Content="Name:" Margin="0, 0, 10, 0" />
23-
<TextBox x:Name="WebElementName"
24-
controls:TextBoxHelper.Watermark="Element name"
23+
<TextBox x:Name="TxtUiObjectName"
24+
controls:TextBoxHelper.Watermark="Ui object name"
2525
controls:TextBoxHelper.IsSpellCheckContextMenuEnabled="True"
2626
Width="404" />
2727
</StackPanel>

src/Testura.Android.PageObjectCreator/Dialogs/NameDialog.xaml.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ public partial class NameDialog : MetroWindow
1111
public NameDialog()
1212
{
1313
InitializeComponent();
14-
WebElementName.Text = string.Empty;
14+
TxtUiObjectName.Text = string.Empty;
1515
}
1616

17-
public string ElementName { get; set; }
17+
public string UiObjectName { get; set; }
1818

1919
private void BtnOkClick(object sender, RoutedEventArgs e)
2020
{
2121
DialogResult = true;
22-
ElementName = WebElementName.Text;
22+
UiObjectName = TxtUiObjectName.Text;
2323
Close();
2424
}
2525

src/Testura.Android.PageObjectCreator/Dialogs/WithDialog.xaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls"
77
mc:Ignorable="d"
88
TitleCharacterCasing="Normal"
9-
Title="Select Withs" Height="315" Width="575"
9+
Title="Select Withs" Height="345" Width="575"
1010
GlowBrush="{DynamicResource AccentColorBrush}"
1111
Icon="{StaticResource MainIcon}" WindowStartupLocation="CenterScreen"
1212
DataContext="{Binding Source={StaticResource Locator}, Path=WithViewModel}"
@@ -34,7 +34,7 @@
3434
<RowDefinition Height="34"/>
3535
<RowDefinition Height="*"></RowDefinition>
3636
</Grid.RowDefinitions>
37-
<Label Content="Not Select with"
37+
<Label Content="Select not with"
3838
Foreground="White"
3939
Background="{StaticResource WindowTitleColorBrush}"
4040
Margin="10, 5, 10, 5"
@@ -89,9 +89,10 @@
8989
ItemsSource="{Binding Attributes}"
9090
AutoGenerateColumns="False"
9191
CanUserSortColumns="False"
92-
MinHeight="300"
92+
Height="300"
9393
CanUserAddRows="False"
94-
IsReadOnly="True">
94+
IsReadOnly="True"
95+
SelectionUnit="Cell">
9596
<DataGrid.Columns>
9697
<DataGridTextColumn Header="Attribute"
9798
Binding="{Binding Name}"

src/Testura.Android.PageObjectCreator/Models/AndroidElement.cs

Lines changed: 0 additions & 176 deletions
This file was deleted.

src/Testura.Android.PageObjectCreator/Models/Messages/AddAndroidElementMessage.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Testura.Android.Device.Ui.Nodes.Data;
2+
3+
namespace Testura.Android.PageObjectCreator.Models.Messages
4+
{
5+
/// <summary>
6+
/// Message sent when we want to create a new UiObject with this node
7+
/// </summary>
8+
public class AddNodeMessage
9+
{
10+
public Node Node { get; set; }
11+
}
12+
}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
namespace Testura.Android.PageObjectCreator.Models.Messages
1+
using Testura.Android.Device.Ui.Nodes.Data;
2+
3+
namespace Testura.Android.PageObjectCreator.Models.Messages
24
{
35
public class SelectedHierarchyNodeMesssage
46
{
5-
public AndroidElement SelectedAndroidElement { get; set; }
7+
public Node SelectedNode { get; set; }
68
}
79
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
using Testura.Android.Device.Ui.Nodes.Data;
2+
3+
namespace Testura.Android.PageObjectCreator.Models.Messages
4+
{
5+
public class ShowNodeDetailsMessage
6+
{
7+
public Node Node { get; set; }
8+
}
9+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace Testura.Android.PageObjectCreator.Models.Messages
2+
{
3+
public class UiObjectInfoRemovedMessage
4+
{
5+
public UiObjectInfo UiObjectInfo { get; set; }
6+
}
7+
}

src/Testura.Android.PageObjectCreator/Models/UiObjectInfo.cs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Text;
44
using PropertyChanged;
5+
using Testura.Android.Device.Ui.Nodes.Data;
56
using Testura.Android.Util;
67

78
namespace Testura.Android.PageObjectCreator.Models
@@ -15,12 +16,12 @@ public class UiObjectInfo
1516
public string Name { get; set; }
1617

1718
/// <summary>
18-
/// Gets or sets the android element element
19+
/// Gets or sets the node
1920
/// </summary>
20-
public AndroidElement AndroidElement { get; set; }
21+
public Node Node { get; set; }
2122

2223
/// <summary>
23-
/// Gets or sets the find by for a android element
24+
/// Gets or sets the find with for a node
2425
/// </summary>
2526
public IList<AttributeTags> FindWith { get; set; }
2627

@@ -41,15 +42,15 @@ public string GetFindBy()
4142
switch (attributeTagse)
4243
{
4344
case AttributeTags.ResourceId:
44-
stringBuilder.Append($"ResourceId={AndroidElement.ResourceId},");
45+
stringBuilder.Append($"ResourceId={Node.ResourceId},");
4546
break;
4647

4748
case AttributeTags.ContentDesc:
48-
stringBuilder.Append($"ContentDesc={AndroidElement.ContentDesc},");
49+
stringBuilder.Append($"ContentDesc={Node.ContentDesc},");
4950
break;
5051

5152
case AttributeTags.Text:
52-
stringBuilder.Append($"Text={AndroidElement.Text},");
53+
stringBuilder.Append($"Text={Node.Text},");
5354
break;
5455

5556
default:

src/Testura.Android.PageObjectCreator/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@
3939
// You can specify all the values or you can default the Build and Revision Numbers
4040
// by using the '*' as shown below:
4141
// [assembly: AssemblyVersion("1.0.*")]
42-
[assembly: AssemblyVersion("1.0.0.0")]
43-
[assembly: AssemblyFileVersion("1.0.0.0")]
42+
[assembly: AssemblyVersion("1.1.0.0")]
43+
[assembly: AssemblyFileVersion("1.1.0.0")]

src/Testura.Android.PageObjectCreator/Services/DialogService.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class DialogService : IDialogService
1212
public string ShowNameDialog()
1313
{
1414
var dialog = new NameDialog();
15-
return dialog.ShowDialog().Value ? dialog.ElementName : null;
15+
return dialog.ShowDialog().Value ? dialog.UiObjectName : null;
1616
}
1717

1818
/// <summary>

0 commit comments

Comments
 (0)