Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Commit f371282

Browse files
TheCodeTravelerTheCodeTraveler
committed
Merge branch 'master' into release-3.3.0
# Conflicts: # EntryCustomReturn.sln # EntryCustomReturnSampleApp/Helpers/ViewHelpers.cs # MvvmSamples.Common.Forms/ViewModels/MultipleEntryViewModel.cs # MvvmSamples.Shared/MvvmSamples.Shared.projitems # README.md # SimpleXamlSample/SimpleXamlSample.csproj
2 parents e776539 + 95c5456 commit f371282

File tree

80 files changed

+10931
-7097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+10931
-7097
lines changed

‎EntryCustomReturn.Forms.Plugin.Android/Resources/Resource.Designer.cs

Lines changed: 11 additions & 6931 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EntryCustomReturn.sln

Lines changed: 120 additions & 10 deletions
Large diffs are not rendered by default.

‎EntryCustomReturnSampleApp.Droid/EntryCustomReturnSampleApp.Droid.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,14 @@
120120
</Reference>
121121
</ItemGroup>
122122
<ItemGroup>
123-
<ProjectReference Include="..\EntryCustomReturnSampleApp\EntryCustomReturnSampleApp.csproj">
124-
<Project>{4668C385-45C4-495D-803C-FFDAE866FD60}</Project>
125-
<Name>EntryCustomReturnSampleApp</Name>
126-
</ProjectReference>
127123
<ProjectReference Include="..\EntryCustomReturn.Forms.Plugin.Android\EntryCustomReturn.Forms.Plugin.Android.csproj">
128124
<Project>{1477793F-94BF-450F-A1F6-059B29DB18BE}</Project>
129125
<Name>EntryCustomReturn.Forms.Plugin.Android</Name>
130126
</ProjectReference>
127+
<ProjectReference Include="..\EntryCustomReturnSampleApp\EntryCustomReturnSampleApp.csproj">
128+
<Project>{BBF1C237-8185-4ADF-8481-DF6E2F3CE8ED}</Project>
129+
<Name>EntryCustomReturnSampleApp</Name>
130+
</ProjectReference>
131131
</ItemGroup>
132132
<ItemGroup>
133133
<Compile Include="MainActivity.cs" />

‎EntryCustomReturnSampleApp.UITests/EntryCustomReturnSampleApp.UITests.csproj

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333
<HintPath>..\packages\Xamarin.UITest.2.2.2\lib\net45\Xamarin.UITest.dll</HintPath>
3434
</Reference>
3535
</ItemGroup>
36-
<ItemGroup>
37-
<Compile Include="Tests\MultipleEntryPageTests.cs" />
38-
<Compile Include="Pages\MultipleEntryPage.cs" />
39-
<Compile Include="Pages\OptionSelectionPage.cs" />
40-
<Compile Include="Pages\PickEntryReturnTypePage.cs" />
41-
<Compile Include="Helpers\TestHelpers.cs" />
42-
<Compile Include="Tests\PickEntryReturnTypeTests.cs" />
43-
<Compile Include="Tests\Base\EntryCustomReturnSampleAppBaseTest.cs" />
44-
</ItemGroup>
4536
<ItemGroup>
4637
<None Include="packages.config" />
4738
</ItemGroup>
@@ -64,10 +55,8 @@
6455
<Name>EntryCustomReturn.Forms.Plugin.Abstractions</Name>
6556
</ProjectReference>
6657
</ItemGroup>
67-
<ItemGroup>
68-
<Folder Include="Tests\Base\" />
69-
</ItemGroup>
58+
<Import Project="..\MvvmSamples.UITests.Shared\MvvmSamples.UITests.Shared.projitems" Label="Shared" Condition="Exists('..\MvvmSamples.UITests.Shared\MvvmSamples.UITests.Shared.projitems')" />
59+
<Import Project="..\MvvmSamples.Shared\MvvmSamples.Shared.projitems" Label="Shared" Condition="Exists('..\MvvmSamples.Shared\MvvmSamples.Shared.projitems')" />
7060
<Import Project="..\Tests.Shared\Tests.Shared.projitems" Label="Shared" Condition="Exists('..\Tests.Shared\Tests.Shared.projitems')" />
71-
<Import Project="..\EntryCustomReturnSampleApp.Shared\EntryCustomReturnSampleApp.Shared.projitems" Label="Shared" Condition="Exists('..\EntryCustomReturnSampleApp.Shared\EntryCustomReturnSampleApp.Shared.projitems')" />
7261
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
7362
</Project>

‎EntryCustomReturnSampleApp.UWP/EntryCustomReturnSampleApp.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
1414
<TargetPlatformVersion>10.0.16299.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
15+
<TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
1818
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>

‎EntryCustomReturnSampleApp.iOS/EntryCustomReturnSampleApp.iOS.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,14 @@
108108
</Reference>
109109
</ItemGroup>
110110
<ItemGroup>
111-
<ProjectReference Include="..\EntryCustomReturnSampleApp\EntryCustomReturnSampleApp.csproj">
112-
<Project>{4668C385-45C4-495D-803C-FFDAE866FD60}</Project>
113-
<Name>EntryCustomReturnSampleApp</Name>
114-
</ProjectReference>
115111
<ProjectReference Include="..\EntryCustomReturn.Forms.Plugin.iOSUnified\EntryCustomReturn.Forms.Plugin.iOS.csproj">
116112
<Project>{085E453B-C898-4D35-BA27-61EF81A6BAB4}</Project>
117113
<Name>EntryCustomReturn.Forms.Plugin.iOS</Name>
118114
</ProjectReference>
115+
<ProjectReference Include="..\EntryCustomReturnSampleApp\EntryCustomReturnSampleApp.csproj">
116+
<Project>{BBF1C237-8185-4ADF-8481-DF6E2F3CE8ED}</Project>
117+
<Name>EntryCustomReturnSampleApp</Name>
118+
</ProjectReference>
119119
</ItemGroup>
120120
<ItemGroup>
121121
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">

‎EntryCustomReturnSampleApp/EntryCustomReturnSampleApp.csproj

Lines changed: 8 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{4668C385-45C4-495D-803C-FFDAE866FD60}</ProjectGuid>
7-
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8-
<UseMSBuildEngine>true</UseMSBuildEngine>
9-
<OutputType>Library</OutputType>
10-
<RootNamespace>EntryCustomReturnSampleApp</RootNamespace>
11-
<AssemblyName>EntryCustomReturnSampleApp</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
14-
<NuGetPackageImportStamp>
15-
</NuGetPackageImportStamp>
4+
<TargetFramework>netstandard2.0</TargetFramework>
165
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug</OutputPath>
22-
<DefineConstants>DEBUG;</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release</OutputPath>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Compile Include="App.cs" />
34-
<Compile Include="Properties\AssemblyInfo.cs" />
35-
<Compile Include="Pages\MultipleCustomRendererEntryPage.cs" />
36-
<Compile Include="Pages\BaseContentPage.cs" />
37-
<Compile Include="ViewModels\BaseViewModel.cs" />
38-
<Compile Include="ViewModels\MultipleEntryViewModel.cs" />
39-
<Compile Include="Pages\PickCustomRendererEntryReturnTypePage.cs" />
40-
<Compile Include="ViewModels\PickEntryReturnTypeViewModel.cs" />
41-
<Compile Include="Pages\OptionSelectionPage.cs" />
42-
<Compile Include="Helpers\ViewHelpers.cs" />
43-
<Compile Include="Pages\MultipleEffectsEntryPage.cs" />
44-
<Compile Include="Pages\PickEffectsEntryReturnTypePage.cs" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<ProjectReference Include="..\EntryCustomReturn.Forms.Plugin.Abstractions\EntryCustomReturn.Forms.Plugin.Abstractions.csproj">
48-
<Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
49-
<Name>EntryCustomReturn.Forms.Plugin.Abstractions</Name>
50-
</ProjectReference>
51-
</ItemGroup>
6+
527
<ItemGroup>
53-
<Reference Include="Xamarin.Forms.Core">
54-
<HintPath>..\packages\Xamarin.Forms.2.5.0.122203\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
55-
<Private>False</Private>
56-
</Reference>
57-
<Reference Include="Xamarin.Forms.Platform">
58-
<HintPath>..\packages\Xamarin.Forms.2.5.0.122203\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
59-
<Private>False</Private>
60-
</Reference>
61-
<Reference Include="Xamarin.Forms.Xaml">
62-
<HintPath>..\packages\Xamarin.Forms.2.5.0.122203\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
63-
<Private>False</Private>
64-
</Reference>
8+
<Folder Include="Pages\" />
9+
<Folder Include="Helpers\" />
6510
</ItemGroup>
6611
<ItemGroup>
67-
<None Include="packages.config" />
12+
<ProjectReference Include="..\MvvmSamples.Common.Forms\MvvmSamples.Common.Forms.csproj" />
6813
</ItemGroup>
69-
<Import Project="..\EntryCustomReturnSampleApp.Shared\EntryCustomReturnSampleApp.Shared.projitems" Label="Shared" Condition="Exists('..\EntryCustomReturnSampleApp.Shared\EntryCustomReturnSampleApp.Shared.projitems')" />
70-
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
71-
<Import Project="..\packages\Xamarin.Forms.2.3.3.180\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.3.180\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
72-
<Import Project="..\..\Tests\packages\Xamarin.Forms.2.3.4.192-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\Tests\packages\Xamarin.Forms.2.3.4.192-pre2\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
73-
<Import Project="..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.4.247\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
74-
<Import Project="..\..\Tests\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\Tests\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
75-
<Import Project="..\packages\Xamarin.Forms.2.5.0.122203\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.5.0.122203\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
76-
</Project>
14+
</Project>

‎EntryCustomReturnSampleApp/Helpers/ViewHelpers.cs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using Xamarin.Forms;
44

55
using EntryCustomReturn.Forms.Plugin.Abstractions;
6-
using EntryCustomReturnSampleApp.Shared;
6+
7+
using MvvmSamples.Shared;
8+
using MvvmSamples.Common.Forms;
79

810
namespace EntryCustomReturnSampleApp
911
{
@@ -50,37 +52,37 @@ public static View CreateMultipleEntryPageLayout(bool shouldUseEffects, Multiple
5052
{
5153
var defaultReturnTypeEntry = CreateEntry(shouldUseEffects,
5254
ReturnType.Default,
53-
"Return Type: Default",
55+
MultipleEntryPageConstants.DefaultReturnTypeEntryPlaceholder,
5456
AutomationIdConstants.DefaultReturnTypeEntryAutomationId,
5557
nameof(multipleEntryViewModel.DefaultReturnTypeEntryText));
5658

5759
var nextReturnTypeEntry = CreateEntry(shouldUseEffects,
5860
ReturnType.Next,
59-
"Return Type: Next",
61+
MultipleEntryPageConstants.NextReturnTypeEntryPlaceholder,
6062
AutomationIdConstants.NextReturnTypeEntryAutomationId,
6163
nameof(multipleEntryViewModel.NextReturnTypeEntryText));
6264

6365
var doneReturnTypeEntry = CreateEntry(shouldUseEffects,
6466
ReturnType.Done,
65-
"Return Type: Done",
67+
MultipleEntryPageConstants.DoneReturnTypeEntryPlaceholder,
6668
AutomationIdConstants.DoneReturnTypeEntryAutomationId,
6769
nameof(multipleEntryViewModel.DoneReturnTypeEntryText));
6870

6971
var sendReturnTypeEntry = CreateEntry(shouldUseEffects,
7072
ReturnType.Send,
71-
"Return Type: Send",
73+
MultipleEntryPageConstants.SendReturnTypeEntryPlaceholder,
7274
AutomationIdConstants.SendReturnTypeEntryAutomationId,
7375
nameof(multipleEntryViewModel.SendReturnTypeEntryText));
7476

7577
var searchReturnTypeEntry = CreateEntry(shouldUseEffects,
7678
ReturnType.Search,
77-
"Return Type: Search",
79+
MultipleEntryPageConstants.SearchReturnTypeEntryPlaceholder,
7880
AutomationIdConstants.SearchReturnTypeEntryAutomationId,
7981
nameof(multipleEntryViewModel.SearchReturnTypeEntryText));
8082

8183
var goReturnTypeEntry = CreateEntry(shouldUseEffects,
8284
ReturnType.Go,
83-
"Return Type: Go",
85+
MultipleEntryPageConstants.GoReturnTypeEntryPlaceholder,
8486
AutomationIdConstants.GoReturnTypeEntryAutomationId,
8587
nameof(multipleEntryViewModel.GoReturnTypeEntryText));
8688

@@ -93,7 +95,7 @@ public static View CreateMultipleEntryPageLayout(bool shouldUseEffects, Multiple
9395

9496
var goButton = new Button
9597
{
96-
Text = "Go",
98+
Text = MultipleEntryPageConstants.GoButtonText,
9799
AutomationId = AutomationIdConstants.GoButtonAutomationId
98100
};
99101
goButton.SetBinding(Button.CommandProperty, nameof(multipleEntryViewModel.GoButtonCommand));
@@ -105,7 +107,6 @@ public static View CreateMultipleEntryPageLayout(bool shouldUseEffects, Multiple
105107
};
106108
resultLabel.SetBinding(Label.TextProperty, nameof(multipleEntryViewModel.ResultLabelText));
107109

108-
109110
var mainStackLayout = new StackLayout
110111
{
111112
Children = {
@@ -123,6 +124,7 @@ public static View CreateMultipleEntryPageLayout(bool shouldUseEffects, Multiple
123124
return new ScrollView { Content = mainStackLayout };
124125
}
125126

127+
<<<<<<< HEAD
126128
public static Thickness GetPagePadding()
127129
{
128130
switch (Device.RuntimePlatform)
@@ -137,6 +139,8 @@ public static Thickness GetPagePadding()
137139
}
138140
}
139141

142+
=======
143+
>>>>>>> master
140144
static Entry CreateEntry(bool shouldUseEffects, ReturnType returnType, string placeholder, string automationId, string bindingSource)
141145
{
142146
Entry entry;

‎EntryCustomReturnSampleApp/Pages/MultipleCustomRendererEntryPage.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using Xamarin.Forms;
2-
3-
using EntryCustomReturnSampleApp.Shared;
1+
using MvvmSamples.Shared;
2+
using MvvmSamples.Common.Forms;
43

54
namespace EntryCustomReturnSampleApp
65
{
@@ -15,7 +14,7 @@ public MultipleCustomRendererEntryPage()
1514
{
1615
Title = PageTitles.MultipleEntryPageTitle;
1716

18-
Padding = ViewHelpers.GetPagePadding();
17+
Padding = GetDefaultPagePadding();
1918

2019
Content = ViewHelpers.CreateMultipleEntryPageLayout(false, ViewModel);
2120
}

‎EntryCustomReturnSampleApp/Pages/MultipleEffectsEntryPage.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
using Xamarin.Forms;
2-
3-
using EntryCustomReturnSampleApp.Shared;
1+
using MvvmSamples.Shared;
2+
using MvvmSamples.Common.Forms;
43

54
namespace EntryCustomReturnSampleApp
65
{
@@ -11,7 +10,7 @@ public MultipleEffectsEntryPage()
1110
{
1211
Title = PageTitles.MultipleEntryPageTitle;
1312

14-
Padding = ViewHelpers.GetPagePadding();
13+
Padding = GetDefaultPagePadding();
1514

1615
Content = ViewHelpers.CreateMultipleEntryPageLayout(true, ViewModel);
1716
}

‎EntryCustomReturnSampleApp/Pages/OptionSelectionPage.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
using System;
2-
using System.Collections.Generic;
32

43
using Xamarin.Forms;
54

6-
using EntryCustomReturnSampleApp.Shared;
5+
using MvvmSamples.Shared;
6+
using MvvmSamples.Common.Forms;
77

88
namespace EntryCustomReturnSampleApp
99
{
1010
public class OptionSelectionPage : BaseContentPage<BaseViewModel>
1111
{
1212
#region Constant Fields
13-
readonly Button _openMultileEntryPageButton, _openPickerEntryPageButton;
13+
readonly Button _openMultipleEntryPageButton, _openPickerEntryPageButton;
1414
readonly Picker _entryTypePicker;
1515
#endregion
1616

1717
#region Constructors
1818
public OptionSelectionPage()
1919
{
20-
_openMultileEntryPageButton = new Button
20+
_openMultipleEntryPageButton = new Button
2121
{
22-
Text = "Multiple Entry Page",
22+
Text = OpenSelectionPageConstants.OpenMultipleEntryPageButtonText,
2323
AutomationId = AutomationIdConstants.OpenMultileEntryPageButtonAutomationId
2424
};
2525

2626
_openPickerEntryPageButton = new Button
2727
{
28-
Text = "Return Type Picker Page",
28+
Text = OpenSelectionPageConstants.OpenPickerEntryPageButtonText,
2929
AutomationId = AutomationIdConstants.OpenPickerEntryPageButtonAutomationId
3030
};
3131

3232
var pickerLabel = new Label
3333
{
34-
Text = "Generate Entrys Using"
34+
Text = OpenSelectionPageConstants.PickerLabelText
3535
};
3636

3737
_entryTypePicker = new Picker
@@ -53,7 +53,7 @@ public OptionSelectionPage()
5353
pickerLabel,
5454
_entryTypePicker,
5555
_openPickerEntryPageButton,
56-
_openMultileEntryPageButton
56+
_openMultipleEntryPageButton
5757
}
5858
};
5959
}
@@ -63,13 +63,13 @@ public OptionSelectionPage()
6363
protected override void SubscribeEventHandlers()
6464
{
6565
_openPickerEntryPageButton.Clicked += HandleOpenSelectEntryPageButtonClicked;
66-
_openMultileEntryPageButton.Clicked += HandleOpenMultipleEntryPageButtonClicked;
66+
_openMultipleEntryPageButton.Clicked += HandleOpenMultipleEntryPageButtonClicked;
6767
}
6868

6969
protected override void UnsubscribeEventHandlers()
7070
{
7171
_openPickerEntryPageButton.Clicked -= HandleOpenSelectEntryPageButtonClicked;
72-
_openMultileEntryPageButton.Clicked -= HandleOpenMultipleEntryPageButtonClicked;
72+
_openMultipleEntryPageButton.Clicked -= HandleOpenMultipleEntryPageButtonClicked;
7373
}
7474

7575
void HandleOpenMultipleEntryPageButtonClicked(object sender, EventArgs e)

‎EntryCustomReturnSampleApp/Pages/PickCustomRendererEntryReturnTypePage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Xamarin.Forms;
22

3-
using EntryCustomReturnSampleApp.Shared;
3+
using MvvmSamples.Shared;
4+
using MvvmSamples.Common.Forms;
45

56
namespace EntryCustomReturnSampleApp
67
{

‎EntryCustomReturnSampleApp/Pages/PickEffectsEntryReturnTypePage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Xamarin.Forms;
22

3-
using EntryCustomReturnSampleApp.Shared;
3+
using MvvmSamples.Shared;
4+
using MvvmSamples.Common.Forms;
45

56
namespace EntryCustomReturnSampleApp
67
{

‎EntryCustomReturnSampleApp/packages.config

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

0 commit comments

Comments
 (0)