diff options
author | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-08-13 12:56:44 +0400 |
---|---|---|
committer | Atsushi Eno <atsushieno@veritas-vos-liberabit.com> | 2013-08-13 12:56:44 +0400 |
commit | cd5144844f830c02bd75e283efd122aa05f1e1ef (patch) | |
tree | 6349c1e15b9c3a65d79fe81c772cc299abe8f391 | |
parent | 41552228f30136959d519342bb923f92ba08454a (diff) |
Add missing project files and remove old files.
29 files changed, 717 insertions, 85 deletions
diff --git a/Rx/NET/Source/Rx_Xamarin/android/Makefile b/Rx/NET/Source/Rx_Xamarin/android/Makefile deleted file mode 100644 index d2ecc18..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -all: MonoDroid.Dialog Andr.Unit - -MonoDroid.Dialog: - git clone git://github.com/atsushieno/MonoDroid.Dialog.git - -Andr.Unit: - git clone git://github.com/pjcollins/Andr.Unit.git - cd Andr.Unit && git checkout bae4bbfc && patch -i ../andr-unit-rx.patch -p1 || exit 1 - - diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt new file mode 100644 index 0000000..a9b0638 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt @@ -0,0 +1,19 @@ +Any raw assets you want to be deployed with your application can be placed in +this directory (and child directories) and given a Build Action of "AndroidAsset". + +These files will be deployed with your package and will be accessible using Android's +AssetManager, like this: + +public class ReadAsset : Activity +{ + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + InputStream input = Assets.Open ("my_asset.txt"); + } +} + +Additionally, some Android functions will automatically load asset files: + +Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs new file mode 100644 index 0000000..328b5af --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using Android.App; +using Android.OS; +using Xamarin.Android.NUnitLite; + +namespace ReactiveTestApplication +{ + [Activity (Label = "ReactiveTestApplication", MainLauncher = true)] + public class MainActivity : TestSuiteActivity + { + protected override void OnCreate (Bundle bundle) + { + AddTest (typeof (ReactiveTests.Extensions).Assembly); + // Once you called base.OnCreate(), you cannot add more assemblies. + base.OnCreate (bundle); + } + } +} + diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml new file mode 100644 index 0000000..9431e6d --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="ReactiveTestApplication.ReactiveTestApplication"> + <uses-sdk /> + <application android:label="ReactiveTestApplication"> + </application> +</manifest>
\ No newline at end of file diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..43f0048 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using Android.App; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. +[assembly: AssemblyTitle ("ReactiveTestApplication")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("atsushi")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. +[assembly: AssemblyVersion ("1.0.0")] +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj new file mode 100644 index 0000000..4ece925 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{307C128B-762F-478D-AF70-485A1792DA9A}</ProjectGuid> + <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputType>Library</OutputType> + <RootNamespace>ReactiveTestApplication</RootNamespace> + <AndroidApplication>True</AndroidApplication> + <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> + <AndroidResgenClass>Resource</AndroidResgenClass> + <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> + <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> + <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk> + <AssemblyName>ReactiveTestApplication</AssemblyName> + <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG;</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidLinkMode>None</AndroidLinkMode> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>full</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Core" /> + <Reference Include="Mono.Android" /> + <Reference Include="Xamarin.Android.NUnitLite" /> + </ItemGroup> + <ItemGroup> + <Compile Include="MainActivity.cs" /> + <Compile Include="Resources\Resource.designer.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Resources\AboutResources.txt" /> + <None Include="Assets\AboutAssets.txt" /> + <None Include="Properties\AndroidManifest.xml" /> + </ItemGroup> + <ItemGroup> + <AndroidResource Include="Resources\drawable\Icon.png" /> + </ItemGroup> + <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> + <ItemGroup> + <ProjectReference Include="..\..\..\..\..\..\..\..\..\..\home\atsushi\svn\mono\external\rx\Rx\NET\Source\Rx_Xamarin\android\rx\Tests.System.Reactive\android_Tests.System.Reactive.csproj"> + <Project>{73C5260F-8972-4E7C-822B-1A3A0358FA0B}</Project> + <Name>android_Tests.System.Reactive</Name> + </ProjectReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt new file mode 100644 index 0000000..10f52d4 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt @@ -0,0 +1,44 @@ +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.axml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable/ + icon.png + + layout/ + main.axml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called "R" +(this is an Android convention) that contains the tokens for each one of the resources +included. For example, for the above Resources layout, this is what the R class would expose: + +public class R { + public class drawable { + public const int icon = 0x123; + } + + public class layout { + public const int main = 0x456; + } + + public class strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main +to reference the layout/main.axml file, or R.strings.first_string to reference the first +string in the dictionary file values/strings.xml. diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs new file mode 100644 index 0000000..881ae80 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs @@ -0,0 +1,171 @@ +#pragma warning disable 1591 +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.17020 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +[assembly: Android.Runtime.ResourceDesignerAttribute("ReactiveTestApplication.Resource", IsApplication=true)] + +namespace ReactiveTestApplication +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + public partial class Resource + { + + static Resource() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + public static void UpdateIdValues() + { + global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::ReactiveTestApplication.Resource.Id.OptionHostName; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::ReactiveTestApplication.Resource.Id.OptionPort; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::ReactiveTestApplication.Resource.Id.OptionRemoteServer; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionsButton = global::ReactiveTestApplication.Resource.Id.OptionsButton; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::ReactiveTestApplication.Resource.Id.ResultFullName; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::ReactiveTestApplication.Resource.Id.ResultMessage; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::ReactiveTestApplication.Resource.Id.ResultResultState; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::ReactiveTestApplication.Resource.Id.ResultStackTrace; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::ReactiveTestApplication.Resource.Id.ResultsFailed; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::ReactiveTestApplication.Resource.Id.ResultsId; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsIgnored = global::ReactiveTestApplication.Resource.Id.ResultsIgnored; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsInconclusive = global::ReactiveTestApplication.Resource.Id.ResultsInconclusive; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsMessage = global::ReactiveTestApplication.Resource.Id.ResultsMessage; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsPassed = global::ReactiveTestApplication.Resource.Id.ResultsPassed; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsResult = global::ReactiveTestApplication.Resource.Id.ResultsResult; + global::Xamarin.Android.NUnitLite.Resource.Id.RunTestsButton = global::ReactiveTestApplication.Resource.Id.RunTestsButton; + global::Xamarin.Android.NUnitLite.Resource.Id.TestSuiteListView = global::ReactiveTestApplication.Resource.Id.TestSuiteListView; + global::Xamarin.Android.NUnitLite.Resource.Layout.options = global::ReactiveTestApplication.Resource.Layout.options; + global::Xamarin.Android.NUnitLite.Resource.Layout.results = global::ReactiveTestApplication.Resource.Layout.results; + global::Xamarin.Android.NUnitLite.Resource.Layout.test_result = global::ReactiveTestApplication.Resource.Layout.test_result; + global::Xamarin.Android.NUnitLite.Resource.Layout.test_suite = global::ReactiveTestApplication.Resource.Layout.test_suite; + } + + public partial class Attribute + { + + static Attribute() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Attribute() + { + } + } + + public partial class Drawable + { + + // aapt resource value: 0x7f020000 + public const int Icon = 2130837504; + + static Drawable() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Drawable() + { + } + } + + public partial class Id + { + + // aapt resource value: 0x7f040001 + public const int OptionHostName = 2130968577; + + // aapt resource value: 0x7f040002 + public const int OptionPort = 2130968578; + + // aapt resource value: 0x7f040000 + public const int OptionRemoteServer = 2130968576; + + // aapt resource value: 0x7f040010 + public const int OptionsButton = 2130968592; + + // aapt resource value: 0x7f04000a + public const int ResultFullName = 2130968586; + + // aapt resource value: 0x7f04000c + public const int ResultMessage = 2130968588; + + // aapt resource value: 0x7f04000b + public const int ResultResultState = 2130968587; + + // aapt resource value: 0x7f04000d + public const int ResultStackTrace = 2130968589; + + // aapt resource value: 0x7f040006 + public const int ResultsFailed = 2130968582; + + // aapt resource value: 0x7f040003 + public const int ResultsId = 2130968579; + + // aapt resource value: 0x7f040007 + public const int ResultsIgnored = 2130968583; + + // aapt resource value: 0x7f040008 + public const int ResultsInconclusive = 2130968584; + + // aapt resource value: 0x7f040009 + public const int ResultsMessage = 2130968585; + + // aapt resource value: 0x7f040005 + public const int ResultsPassed = 2130968581; + + // aapt resource value: 0x7f040004 + public const int ResultsResult = 2130968580; + + // aapt resource value: 0x7f04000f + public const int RunTestsButton = 2130968591; + + // aapt resource value: 0x7f04000e + public const int TestSuiteListView = 2130968590; + + static Id() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Id() + { + } + } + + public partial class Layout + { + + // aapt resource value: 0x7f030000 + public const int options = 2130903040; + + // aapt resource value: 0x7f030001 + public const int results = 2130903041; + + // aapt resource value: 0x7f030002 + public const int test_result = 2130903042; + + // aapt resource value: 0x7f030003 + public const int test_suite = 2130903043; + + static Layout() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Layout() + { + } + } + } +} +#pragma warning restore 1591 diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png diff --git a/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch b/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch deleted file mode 100644 index 8f19009..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/Andr.Unit/Andr.Unit.csproj b/Andr.Unit/Andr.Unit.csproj -index 1d64a1b..0ce74c0 100644 ---- a/Andr.Unit/Andr.Unit.csproj -+++ b/Andr.Unit/Andr.Unit.csproj -@@ -115,9 +115,17 @@ - <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> - <Name>Android.NUnitLite</Name> - </ProjectReference> -- <ProjectReference Include="..\m4a.tests\m4a.tests.csproj"> -- <Project>{06D00E82-E637-4A8A-95BE-3E1ADE925B9B}</Project> -- <Name>m4a.tests</Name> -+ <ProjectReference Include="..\..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj"> -+ <Project>{35DEE616-4AD5-4560-9E19-A86836857626}</Project> -+ <Name>android_Mono.Reactive.Testing</Name> -+ </ProjectReference> -+ <ProjectReference Include="..\..\MonoDroid.Dialog\MonoDroid.Dialog\MonoDroid.Dialog.csproj"> -+ <Project>{33044C7B-47A4-4113-A61A-EB429407F818}</Project> -+ <Name>MonoDroid.Dialog</Name> -+ </ProjectReference> -+ <ProjectReference Include="..\..\Tests.System.Reactive\android_Tests.System.Reactive.csproj"> -+ <Project>{93322E90-1596-443D-AE38-F4B4D868BE24}</Project> -+ <Name>android_Tests.System.Reactive</Name> - </ProjectReference> - </ItemGroup> - </Project> -\ No newline at end of file -diff --git a/Andr.Unit/MainActivity.cs b/Andr.Unit/MainActivity.cs -index ce19029..2a2da07 100644 ---- a/Andr.Unit/MainActivity.cs -+++ b/Andr.Unit/MainActivity.cs -@@ -32,7 +32,7 @@ namespace Andr.Unit - // tests can be inside the main assembly - AddTest (Assembly.GetExecutingAssembly ()); - // or in any reference assemblies -- AddTest (typeof (m4a.tests.RunnerTest).Assembly); -+ AddTest (typeof (ReactiveTests.Extensions).Assembly); - // or in any assembly that you load (since JIT is available) - - #if false -diff --git a/Andr.Unit/Resources/Resource.designer.cs b/Andr.Unit/Resources/Resource.designer.cs -index 291e7c6..b09da34 100644 ---- a/Andr.Unit/Resources/Resource.designer.cs -+++ b/Andr.Unit/Resources/Resource.designer.cs -@@ -1,3 +1,4 @@ -+#pragma warning disable 1591 - // ------------------------------------------------------------------------------ - // <autogenerated> - // This code was generated by a tool. -@@ -8,13 +9,20 @@ - // </autogenerated> - // ------------------------------------------------------------------------------ - -+[assembly: Android.Runtime.ResourceDesignerAttribute("Andr.Unit.Resource", IsApplication=true)] -+ - namespace Andr.Unit - { - - -+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - -+ public static void UpdateIdValues() -+ { -+ } -+ - public partial class Attribute - { - -@@ -149,3 +157,4 @@ namespace Andr.Unit - } - } - } -+#pragma warning restore 1591 diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb Binary files differdeleted file mode 100755 index 1bf810f..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb Binary files differdeleted file mode 100644 index 730fcab..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb Binary files differdeleted file mode 100644 index d1117e7..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb Binary files differdeleted file mode 100644 index e4aa021..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb Binary files differdeleted file mode 100644 index 9fa1098..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb Binary files differdeleted file mode 100644 index e3b7b54..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb Binary files differdeleted file mode 100644 index f7cd3f0..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb Binary files differdeleted file mode 100644 index fa5acfa..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb Binary files differdeleted file mode 100644 index de211c3..0000000 --- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb +++ /dev/null diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln new file mode 100644 index 0000000..fadcb16 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveAndroidSample", "ReactiveAndroidSample\ReactiveAndroidSample.csproj", "{0A024D57-A5E0-4648-80E6-C5F525167625}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0A024D57-A5E0-4648-80E6-C5F525167625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = ReactiveAndroidSample\ReactiveAndroidSample.csproj + EndGlobalSection +EndGlobal diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt new file mode 100644 index 0000000..ee39886 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt @@ -0,0 +1,19 @@ +Any raw assets you want to be deployed with your application can be placed in +this directory (and child directories) and given a Build Action of "AndroidAsset". + +These files will be deployed with you package and will be accessible using Android's +AssetManager, like this: + +public class ReadAsset : Activity +{ + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + InputStream input = Assets.Open ("my_asset.txt"); + } +} + +Additionally, some Android functions will automatically load asset files: + +Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs new file mode 100644 index 0000000..98805d4 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs @@ -0,0 +1,47 @@ +using System; +using System.Reactive; +using System.Reactive.Linq; +using Android.App; +using Android.OS; +using Android.Views; +using Android.Widget; + +namespace ReactiveAndroidSample +{ + [Activity (Label = "ReactiveAndroidSample", MainLauncher = true)] + public class Activity1 : Activity + { + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + SetContentView (Resource.Layout.Main); + + var text = FindViewById<TextView> (Resource.Id.theText); + + var surface = FindViewById<View> (Resource.Id.theToucheable); + + triple_touch_source = Observable.FromEventPattern<View.TouchEventArgs> (surface, "Touch") + .Where (ev => ev.EventArgs.Event.Action == MotionEventActions.Move) + .Where (ev => ev.EventArgs.Event.PointerCount == 3) + //.SubscribeOn (Application.SynchronizationContext) + .ToEventPattern (); + + TripleTouch += (sender, ev) => + this.RunOnUiThread (() => + text.Text = GetEventDescription (ev.Event)); + } + + IEventPatternSource<View.TouchEventArgs> triple_touch_source; + + public event EventHandler<View.TouchEventArgs> TripleTouch { + add { triple_touch_source.OnNext += value; } + remove { triple_touch_source.OnNext -= value; } + } + + static string GetEventDescription (MotionEvent e) + { + return string.Format ("({0}, {1})", e.RawX, e.RawY); + } + } +} diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..167d121 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs @@ -0,0 +1,28 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using Android.App; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle("ReactiveAndroidSample")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("atsushi")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion("1.0.0")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. + +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj new file mode 100644 index 0000000..53eec67 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{0A024D57-A5E0-4648-80E6-C5F525167625}</ProjectGuid> + <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputType>Library</OutputType> + <RootNamespace>ReactiveAndroidSample</RootNamespace> + <AndroidApplication>True</AndroidApplication> + <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> + <AndroidResgenClass>Resource</AndroidResgenClass> + <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> + <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> + <AssemblyName>ReactiveAndroidSample</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG;</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidLinkMode>None</AndroidLinkMode> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <ConsolePause>false</ConsolePause> + <AndroidLinkMode>SdkOnly</AndroidLinkMode> + <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Core" /> + <Reference Include="Mono.Android" /> + <Reference Include="System.Reactive.Core"> + <HintPath>..\..\..\libs\System.Reactive.Core.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Interfaces"> + <HintPath>..\..\..\libs\System.Reactive.Interfaces.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Linq"> + <HintPath>..\..\..\libs\System.Reactive.Linq.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.PlatformServices"> + <HintPath>..\..\..\libs\System.Reactive.PlatformServices.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="MainActivity.cs" /> + <Compile Include="Resources\Resource.designer.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Resources\AboutResources.txt" /> + <None Include="Assets\AboutAssets.txt" /> + </ItemGroup> + <ItemGroup> + <AndroidResource Include="Resources\layout\Main.axml" /> + <AndroidResource Include="Resources\values\Strings.xml" /> + <AndroidResource Include="Resources\drawable\Icon.png" /> + </ItemGroup> + <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt new file mode 100644 index 0000000..10f52d4 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt @@ -0,0 +1,44 @@ +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.axml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable/ + icon.png + + layout/ + main.axml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called "R" +(this is an Android convention) that contains the tokens for each one of the resources +included. For example, for the above Resources layout, this is what the R class would expose: + +public class R { + public class drawable { + public const int icon = 0x123; + } + + public class layout { + public const int main = 0x456; + } + + public class strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main +to reference the layout/main.axml file, or R.strings.first_string to reference the first +string in the dictionary file values/strings.xml. diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs new file mode 100644 index 0000000..49d2d5d --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs @@ -0,0 +1,115 @@ +#pragma warning disable 1591 +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.17020 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +[assembly: Android.Runtime.ResourceDesignerAttribute("ReactiveAndroidSample.Resource", IsApplication=true)] + +namespace ReactiveAndroidSample +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + public partial class Resource + { + + static Resource() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + public static void UpdateIdValues() + { + } + + public partial class Attribute + { + + static Attribute() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Attribute() + { + } + } + + public partial class Drawable + { + + // aapt resource value: 0x7f020000 + public const int Icon = 2130837504; + + static Drawable() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Drawable() + { + } + } + + public partial class Id + { + + // aapt resource value: 0x7f050001 + public const int theText = 2131034113; + + // aapt resource value: 0x7f050000 + public const int theToucheable = 2131034112; + + static Id() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Id() + { + } + } + + public partial class Layout + { + + // aapt resource value: 0x7f030000 + public const int Main = 2130903040; + + static Layout() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Layout() + { + } + } + + public partial class String + { + + // aapt resource value: 0x7f040001 + public const int app_name = 2130968577; + + // aapt resource value: 0x7f040000 + public const int hello = 2130968576; + + static String() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private String() + { + } + } + } +} +#pragma warning restore 1591 diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png Binary files differnew file mode 100644 index 0000000..a07c69f --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml new file mode 100644 index 0000000..84cf986 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <View + android:id="@+id/theToucheable" + android:layout_width="fill_parent" + android:layout_height="440.7dp" + android:layout_marginBottom="0.0dp" /> + <TextView + android:id="@+id/theText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="(touch corrdinates shown here)" /> +</LinearLayout> diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml new file mode 100644 index 0000000..0174c85 --- /dev/null +++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="hello">Hello World, Click Me!</string> + <string name="app_name">ReactiveAndroidSample</string> +</resources> |