diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (VS2017Std).sln b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (VS2017Std).sln
index 723155f8..c6b8ffe4 100644
--- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight (VS2017Std).sln
+++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight (VS2017Std).sln
@@ -19,6 +19,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Test (ST
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Test (PNET45Std)", "Tests\PCL\GalaSoft.MvvmLight.Test (PNET45Std)\GalaSoft.MvvmLight.Test (PNET45Std).csproj", "{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd)", "GalaSoft.MvvmLight.AndroidSupport (AndroidStd)\GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj", "{BC2F5D9B-6303-4296-A743-FDA5909416CA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -143,6 +145,22 @@ Global
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x64.Build.0 = Release|Any CPU
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.ActiveCfg = Release|Any CPU
{D6C92A0B-4F54-4340-B0F0-5FACBCF127D6}.Release|x86.Build.0 = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|ARM.Build.0 = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x64.Build.0 = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Debug|x86.Build.0 = Debug|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|ARM.ActiveCfg = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|ARM.Build.0 = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x64.ActiveCfg = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x64.Build.0 = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x86.ActiveCfg = Release|Any CPU
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj
new file mode 100644
index 00000000..ddece030
--- /dev/null
+++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/GalaSoft.MvvmLight.Platform.AndroidSupport (AndroidStd).csproj
@@ -0,0 +1,82 @@
+
+
+
+ Debug
+ AnyCPU
+ 8.0.30703
+ 2.0
+ {BC2F5D9B-6303-4296-A743-FDA5909416CA}
+ {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ Library
+ Properties
+ GalaSoft.MvvmLight
+ GalaSoft.MvvmLight.Platform.AndroidSupport
+ 512
+ Resources\Resource.Designer.cs
+ Off
+ True
+ v7.1
+
+
+ true
+ full
+ false
+ bin\Debug\
+ TRACE;XAMARIN;ANDROID;DEBUG
+ prompt
+ 4
+ bin\Debug\GalaSoft.MvvmLight.Platform.AndroidSupport.XML
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE;XAMARIN;ANDROID
+ prompt
+ 4
+ bin\Release\GalaSoft.MvvmLight.Platform.AndroidSupport.XML
+
+
+
+
+
+
+
+
+
+
+
+ Helpers\CachingViewHolder.cs
+
+
+ Helpers\ExtensionsAndroid2.cs
+
+
+ Helpers\ObservableRecyclerAdapter.cs
+
+
+ Properties\AssemblyInfo.cs
+
+
+
+
+
+
+ {05F13FC2-05A2-4CE2-951F-956BAFEC0D30}
+ GalaSoft.MvvmLight.Platform %28AndroidStd%29
+
+
+
+
+ 23.3.0
+
+
+
+
+
diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/Resources/Resource.Designer.cs b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport (AndroidStd)/Resources/Resource.Designer.cs
new file mode 100644
index 00000000..e69de29b
diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport/GalaSoft.MvvmLight.Platform.AndroidSupport.csproj b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport/GalaSoft.MvvmLight.Platform.AndroidSupport.csproj
index 1ef340a0..014eb1f9 100644
--- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport/GalaSoft.MvvmLight.Platform.AndroidSupport.csproj
+++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.AndroidSupport/GalaSoft.MvvmLight.Platform.AndroidSupport.csproj
@@ -15,7 +15,7 @@
Resources\Resource.Designer.cs
Off
True
- v7.1
+ v8.1
true
@@ -43,14 +43,6 @@
-
- ..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll
- True
-
-
- ..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll
- True
-
@@ -61,15 +53,17 @@
-
-
-
{a5b7741d-e331-438c-b3bf-596b048db622}
GalaSoft.MvvmLight.Platform %28Android%29
+
+
+ 23.3.0
+
+
-
\ No newline at end of file
+
diff --git a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (AndroidStd)/GalaSoft.MvvmLight.Platform (AndroidStd).csproj b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (AndroidStd)/GalaSoft.MvvmLight.Platform (AndroidStd).csproj
index a4af8eb7..b8267cda 100644
--- a/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (AndroidStd)/GalaSoft.MvvmLight.Platform (AndroidStd).csproj
+++ b/GalaSoft.MvvmLight/GalaSoft.MvvmLight.Platform (AndroidStd)/GalaSoft.MvvmLight.Platform (AndroidStd).csproj
@@ -116,4 +116,4 @@
-->
-
\ No newline at end of file
+
diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/GalaSoft.MvvmLight.Test (Android).csproj b/GalaSoft.MvvmLight/Tests/AndroidTestApp/GalaSoft.MvvmLight.Test (Android).csproj
index 6a07f74b..93970df3 100644
--- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/GalaSoft.MvvmLight.Test (Android).csproj
+++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/GalaSoft.MvvmLight.Test (Android).csproj
@@ -1,4 +1,4 @@
-
+
Debug
@@ -168,4 +168,4 @@
-->
-
\ No newline at end of file
+
diff --git a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Resources/Resource.Designer.cs b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Resources/Resource.Designer.cs
index cb6edc87..84f0738e 100644
--- a/GalaSoft.MvvmLight/Tests/AndroidTestApp/Resources/Resource.Designer.cs
+++ b/GalaSoft.MvvmLight/Tests/AndroidTestApp/Resources/Resource.Designer.cs
@@ -53,18 +53,6 @@ public static void UpdateIdValues()
public partial class Attribute
{
- // aapt resource value: 0x7f010000
- public const int layoutManager = 2130771968;
-
- // aapt resource value: 0x7f010002
- public const int reverseLayout = 2130771970;
-
- // aapt resource value: 0x7f010001
- public const int spanCount = 2130771969;
-
- // aapt resource value: 0x7f010003
- public const int stackFromEnd = 2130771971;
-
static Attribute()
{
global::Android.Runtime.ResourceIdManager.UpdateIdValues();
@@ -75,28 +63,6 @@ private Attribute()
}
}
- public partial class Dimension
- {
-
- // aapt resource value: 0x7f040000
- public const int item_touch_helper_max_drag_scroll_per_frame = 2130968576;
-
- // aapt resource value: 0x7f040001
- public const int item_touch_helper_swipe_escape_max_velocity = 2130968577;
-
- // aapt resource value: 0x7f040002
- public const int item_touch_helper_swipe_escape_velocity = 2130968578;
-
- static Dimension()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Dimension()
- {
- }
- }
-
public partial class Drawable
{
@@ -116,62 +82,59 @@ private Drawable()
public partial class Id
{
+ // aapt resource value: 0x7f050001
+ public const int OptionHostName = 2131034113;
+
// aapt resource value: 0x7f050002
- public const int OptionHostName = 2131034114;
+ public const int OptionPort = 2131034114;
- // aapt resource value: 0x7f050003
- public const int OptionPort = 2131034115;
+ // aapt resource value: 0x7f050000
+ public const int OptionRemoteServer = 2131034112;
- // aapt resource value: 0x7f050001
- public const int OptionRemoteServer = 2131034113;
+ // aapt resource value: 0x7f050010
+ public const int OptionsButton = 2131034128;
- // aapt resource value: 0x7f050011
- public const int OptionsButton = 2131034129;
+ // aapt resource value: 0x7f05000b
+ public const int ResultFullName = 2131034123;
+
+ // aapt resource value: 0x7f05000d
+ public const int ResultMessage = 2131034125;
// aapt resource value: 0x7f05000c
- public const int ResultFullName = 2131034124;
+ public const int ResultResultState = 2131034124;
- // aapt resource value: 0x7f05000e
- public const int ResultMessage = 2131034126;
+ // aapt resource value: 0x7f05000a
+ public const int ResultRunSingleMethodTest = 2131034122;
- // aapt resource value: 0x7f05000d
- public const int ResultResultState = 2131034125;
+ // aapt resource value: 0x7f05000e
+ public const int ResultStackTrace = 2131034126;
- // aapt resource value: 0x7f05000b
- public const int ResultRunSingleMethodTest = 2131034123;
+ // aapt resource value: 0x7f050006
+ public const int ResultsFailed = 2131034118;
- // aapt resource value: 0x7f05000f
- public const int ResultStackTrace = 2131034127;
+ // aapt resource value: 0x7f050003
+ public const int ResultsId = 2131034115;
// aapt resource value: 0x7f050007
- public const int ResultsFailed = 2131034119;
-
- // aapt resource value: 0x7f050004
- public const int ResultsId = 2131034116;
+ public const int ResultsIgnored = 2131034119;
// aapt resource value: 0x7f050008
- public const int ResultsIgnored = 2131034120;
+ public const int ResultsInconclusive = 2131034120;
// aapt resource value: 0x7f050009
- public const int ResultsInconclusive = 2131034121;
-
- // aapt resource value: 0x7f05000a
- public const int ResultsMessage = 2131034122;
-
- // aapt resource value: 0x7f050006
- public const int ResultsPassed = 2131034118;
+ public const int ResultsMessage = 2131034121;
// aapt resource value: 0x7f050005
- public const int ResultsResult = 2131034117;
+ public const int ResultsPassed = 2131034117;
- // aapt resource value: 0x7f050010
- public const int RunTestsButton = 2131034128;
+ // aapt resource value: 0x7f050004
+ public const int ResultsResult = 2131034116;
- // aapt resource value: 0x7f050012
- public const int TestSuiteListView = 2131034130;
+ // aapt resource value: 0x7f05000f
+ public const int RunTestsButton = 2131034127;
- // aapt resource value: 0x7f050000
- public const int item_touch_helper_previous_elevation = 2131034112;
+ // aapt resource value: 0x7f050011
+ public const int TestSuiteListView = 2131034129;
static Id()
{
@@ -211,11 +174,11 @@ private Layout()
public partial class String
{
- // aapt resource value: 0x7f060001
- public const int ApplicationName = 2131099649;
+ // aapt resource value: 0x7f040001
+ public const int ApplicationName = 2130968577;
- // aapt resource value: 0x7f060000
- public const int Hello = 2131099648;
+ // aapt resource value: 0x7f040000
+ public const int Hello = 2130968576;
static String()
{
@@ -226,41 +189,6 @@ private String()
{
}
}
-
- public partial class Styleable
- {
-
- public static int[] RecyclerView = new int[] {
- 16842948,
- 2130771968,
- 2130771969,
- 2130771970,
- 2130771971};
-
- // aapt resource value: 0
- public const int RecyclerView_android_orientation = 0;
-
- // aapt resource value: 1
- public const int RecyclerView_layoutManager = 1;
-
- // aapt resource value: 3
- public const int RecyclerView_reverseLayout = 3;
-
- // aapt resource value: 2
- public const int RecyclerView_spanCount = 2;
-
- // aapt resource value: 4
- public const int RecyclerView_stackFromEnd = 4;
-
- static Styleable()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Styleable()
- {
- }
- }
}
}
#pragma warning restore 1591