Skip to content

Commit

Permalink
Merge pull request #32 from Microsoft/develop
Browse files Browse the repository at this point in the history
0.1.0 release
  • Loading branch information
achocron authored Nov 10, 2016
2 parents 8b62810 + b7ac586 commit c15b11a
Show file tree
Hide file tree
Showing 265 changed files with 5,625 additions and 4,194 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,29 +74,29 @@
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Microsoft.Sonoma.Analytics.Android.Bindings\Microsoft.Sonoma.Analytics.Android.Bindings.csproj">
<Project>{34771dc0-9684-45be-9c9c-5a686468722c}</Project>
<Name>Microsoft.Sonoma.Analytics.Android.Bindings</Name>
<ProjectReference Include="..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android\Microsoft.Azure.Mobile.Analytics.Android.csproj">
<Project>{93E4ADA5-8D7A-44BF-9549-0AD76AB86E8F}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Sonoma.Analytics.Android\Microsoft.Sonoma.Analytics.Android.csproj">
<Project>{93e4ada5-8d7a-44bf-9549-0ad76ab86e8f}</Project>
<Name>Microsoft.Sonoma.Analytics.Android</Name>
<ProjectReference Include="..\..\SDK\MobileCenterAnalytics\Microsoft.Azure.Mobile.Analytics.Android.Bindings\Microsoft.Azure.Mobile.Analytics.Android.Bindings.csproj">
<Project>{34771DC0-9684-45BE-9C9C-5A686468722C}</Project>
<Name>Microsoft.Azure.Mobile.Analytics.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Sonoma.Core.Android.Bindings\Microsoft.Sonoma.Core.Android.Bindings.csproj">
<Project>{c3b5ba33-da39-400d-b5b3-85c68354fd74}</Project>
<Name>Microsoft.Sonoma.Core.Android.Bindings</Name>
<ProjectReference Include="..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.Android.Bindings\Microsoft.Azure.Mobile.Android.Bindings.csproj">
<Project>{C3B5BA33-DA39-400D-B5B3-85C68354FD74}</Project>
<Name>Microsoft.Azure.Mobile.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Sonoma.Core.Android\Microsoft.Sonoma.Core.Android.csproj">
<Project>{119c1730-e109-4bc9-aa89-9dca2c50bfd5}</Project>
<Name>Microsoft.Sonoma.Core.Android</Name>
<ProjectReference Include="..\..\SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Android\Microsoft.Azure.Mobile.Crashes.Android.csproj">
<Project>{D6DB87CA-B8EC-4A38-805F-AFDC7FEC38EB}</Project>
<Name>Microsoft.Azure.Mobile.Crashes.Android</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Sonoma.Crashes.Android.Bindings\Microsoft.Sonoma.Crashes.Android.Bindings.csproj">
<Project>{42d541d7-b7c9-45a7-8d4d-8fb5a00668b3}</Project>
<Name>Microsoft.Sonoma.Crashes.Android.Bindings</Name>
<ProjectReference Include="..\..\SDK\MobileCenterCrashes\Microsoft.Azure.Mobile.Crashes.Android.Bindings\Microsoft.Azure.Mobile.Crashes.Android.Bindings.csproj">
<Project>{42D541D7-B7C9-45A7-8D4D-8FB5A00668B3}</Project>
<Name>Microsoft.Azure.Mobile.Crashes.Android.Bindings</Name>
</ProjectReference>
<ProjectReference Include="..\Microsoft.Sonoma.Crashes.Android\Microsoft.Sonoma.Crashes.Android.csproj">
<Project>{d6db87ca-b8ec-4a38-805f-afdc7fec38eb}</Project>
<Name>Microsoft.Sonoma.Crashes.Android</Name>
<ProjectReference Include="..\..\SDK\MobileCenter\Microsoft.Azure.Mobile.Android\Microsoft.Azure.Mobile.Android.csproj">
<Project>{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}</Project>
<Name>Microsoft.Azure.Mobile.Android</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
Expand All @@ -107,4 +107,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
using Android.App;
using Android.OS;
using Android.Widget;
using Microsoft.Sonoma.Analytics;
using Microsoft.Sonoma.Core;
using Microsoft.Sonoma.Crashes;
using Microsoft.Azure.Mobile.Analytics;
using Microsoft.Azure.Mobile;
using Microsoft.Azure.Mobile.Crashes;
using System.Collections.Generic;

namespace Contoso.Android.Puppet
{
[Activity(Label = "SXPuppet", MainLauncher = true, Icon = "@drawable/icon")]
public class MainActivity : Activity
{
private const string LOG_TAG = "SonomaXamarinPuppet";
private const string LogTag = "MobileCenterXamarinPuppet";

protected override void OnCreate(Bundle savedInstanceState)
{
Expand All @@ -29,13 +29,13 @@ protected override void OnCreate(Bundle savedInstanceState)
button.Text = button.Text.Substring(42);
};

// Sonoma integration
SonomaLog.Info(LOG_TAG, "Sonoma.LogLevel=" + Sonoma.LogLevel);
Sonoma.LogLevel = LogLevel.Verbose;
SonomaLog.Info(LOG_TAG, "Sonoma.LogLevel=" + Sonoma.LogLevel);
Sonoma.Start("44cd8722-bfe0-4748-ac14-7692e031a8a5", typeof(Analytics), typeof(Crashes));
// Mobile Center integration
MobileCenterLog.Assert(LogTag, "MobileCenter.LogLevel=" + MobileCenter.LogLevel);
MobileCenter.LogLevel = LogLevel.Verbose;
MobileCenterLog.Info(LogTag, "MobileCenter.LogLevel=" + MobileCenter.LogLevel);
MobileCenter.Start("44cd8722-bfe0-4748-ac14-7692e031a8a5", typeof(Analytics), typeof(Crashes));
Analytics.TrackEvent("myEvent", new Dictionary<string, string> { { "someKey", "someValue" } });
SonomaLog.Info(LOG_TAG, "Sonoma.InstallId=" + Sonoma.InstallId);
MobileCenterLog.Info(LogTag, "MobileCenter.InstallId=" + MobileCenter.InstallId);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.sonoma.xamarin.puppet" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.microsoft.azure.mobile.xamarin.puppet" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" />
<application android:label="SXPuppet" android:icon="@drawable/Icon"></application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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
These files will be deployed with your package and will be accessible using Android's
AssetManager, like this:

public class ReadAsset : Activity
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?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>
<ProjectGuid>{3B39B339-86C4-47EF-8F85-811220494CA6}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<RootNamespace>Contoso.Forms.Demo.Droid</RootNamespace>
<AssemblyName>Contoso.Forms.Demo.Droid</AssemblyName>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
</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>
<AndroidSupportedAbis>arm64-v8a;armeabi;armeabi-v7a;x86</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Microsoft.Azure.Mobile.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.Analytics.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Analytics">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Analytics.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.Analytics.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v4">
<HintPath>..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.CardView">
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.RecyclerView">
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Vector.Drawable">
<HintPath>..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable">
<HintPath>..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.Design">
<HintPath>..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.MediaRouter">
<HintPath>..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
</Reference>
<Reference Include="FormsViewGroup">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\..\packages\Xamarin.Forms.2.3.2.127\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes.Android.Bindings">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.Crashes.Android.Bindings.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Mobile.Crashes">
<HintPath>..\..\..\packages\Microsoft.Azure.Mobile.Crashes.0.1.0-SNAPSHOT\lib\MonoAndroid403\Microsoft.Azure.Mobile.Crashes.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="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Tabbar.axml" />
<AndroidResource Include="Resources\layout\Toolbar.axml" />
<AndroidResource Include="Resources\values\styles.xml" />
<AndroidResource Include="Resources\drawable\icon.png" />
<AndroidResource Include="Resources\drawable-hdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xhdpi\icon.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\icon.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Contoso.Forms.Demo\Contoso.Forms.Demo.csproj">
<Project>{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}</Project>
<Name>Contoso.Forms.Demo</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.3.163-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.163-pre3\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\..\packages\Xamarin.Forms.2.3.2.127\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
</Project>
26 changes: 26 additions & 0 deletions Apps/Contoso.Forms.Demo/Contoso.Forms.Demo.Droid/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
using Android.App;
using Android.Content.PM;
using Android.OS;

using Microsoft.Azure.Mobile;

namespace Contoso.Forms.Demo.Droid
{
[Activity(Label = "Contoso.Forms.Demo.Droid", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : Xamarin.Forms.Platform.Android.FormsAppCompatActivity
{
protected override void OnCreate(Bundle savedInstanceState)
{
TabLayoutResource = Resource.Layout.Tabbar;
ToolbarResource = Resource.Layout.Toolbar;

base.OnCreate(savedInstanceState);

Xamarin.Forms.Forms.Init(this, savedInstanceState);

MobileCenter.Initialize("44cd8722-bfe0-4748-ac14-7692e031a8a5");

LoadApplication(new App());
}
}
}
Original file line number Diff line number Diff line change
@@ -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="com.contoso.contoso_forms_demo">
<uses-sdk android:minSdkVersion="15" />
<application android:label="Contoso.Forms.Demo">
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
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("Microsoft.Sonoma.Analytics.Forms")]
[assembly: AssemblyTitle("Contoso.Forms.Demo.Droid")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
[assembly: AssemblyCopyright("")]
[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("0.0.*")]
[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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ public class R {

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.
string in the dictionary file values/strings.xml.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/sliding_tabs" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" app:tabIndicatorColor="@android:color/white" app:tabGravity="fill" app:tabMode="fixed" />
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="?attr/colorPrimary" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
Loading

0 comments on commit c15b11a

Please sign in to comment.