From b43fea8af787141c76c7e5ceb76ff2952dd92fd4 Mon Sep 17 00:00:00 2001
From: ermau <me@ermau.com>
Date: Wed, 21 Aug 2013 14:04:49 -0400
Subject: [PATCH] Improve Android sample

---
 .../MainActivity.cs                           | 33 +++++++++++--------
 .../Properties/AndroidManifest.xml            |  5 ++-
 .../Resources/Resource.designer.cs            | 23 ++++++-------
 .../Resources/layout/Main.axml                |  5 ---
 .../Xamarin.Auth Sample (Android).csproj      |  2 +-
 5 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/samples/Xamarin.Auth.Sample.Android/MainActivity.cs b/samples/Xamarin.Auth.Sample.Android/MainActivity.cs
index 9cb40e8b0..d7e988ebe 100644
--- a/samples/Xamarin.Auth.Sample.Android/MainActivity.cs
+++ b/samples/Xamarin.Auth.Sample.Android/MainActivity.cs
@@ -23,38 +23,45 @@ void LoginToFacebook (bool allowCancel)
 			// If authorization succeeds or is canceled, .Completed will be fired.
 			auth.Completed += (s, ee) => {
 				if (!ee.IsAuthenticated) {
-					this.facebookStatus.Text = "Not Authenticated";
+					var builder = new AlertDialog.Builder (this);
+					builder.SetMessage ("Not Authenticated");
+					builder.SetPositiveButton ("Ok", (o, e) => { });
+					builder.Create().Show();
 					return;
 				}
 
 				// Now that we're logged in, make a OAuth2 request to get the user's info.
 				var request = new OAuth2Request ("GET", new Uri ("https://graph.facebook.com/me"), null, ee.Account);
 				request.GetResponseAsync().ContinueWith (t => {
-					if (t.IsFaulted)
-						this.facebookStatus.Text = "Error: " + t.Exception.InnerException.Message;
-					else if (t.IsCanceled)
-						this.facebookStatus.Text = "Canceled";
-					else
-					{
+					var builder = new AlertDialog.Builder (this);
+					if (t.IsFaulted) {
+						builder.SetTitle ("Error");
+						builder.SetMessage (t.Exception.Flatten().InnerException.ToString());
+					} else if (t.IsCanceled)
+						builder.SetTitle ("Task Canceled");
+					else {
 						var obj = JsonValue.Parse (t.Result.GetResponseText());
-						this.facebookStatus.Text = "Logged in as " + obj["name"];
+
+						builder.SetTitle ("Logged in");
+						builder.SetMessage ("Name: " + obj["name"]);
 					}
-				}, uiScheduler);
+
+					builder.SetPositiveButton ("Ok", (o, e) => { });
+					builder.Create().Show();
+				}, UIScheduler);
 			};
 
 			var intent = auth.GetUI (this);
-			StartActivityForResult (intent, 42);
+			StartActivity (intent);
 		}
 
-		private TextView facebookStatus;
-		private readonly TaskScheduler uiScheduler = TaskScheduler.FromCurrentSynchronizationContext();
+		private static readonly TaskScheduler UIScheduler = TaskScheduler.FromCurrentSynchronizationContext();
 
 		protected override void OnCreate (Bundle bundle)
 		{
 			base.OnCreate (bundle);
 			SetContentView (Resource.Layout.Main);
 
-			this.facebookStatus = FindViewById<TextView> (Resource.Id.FacebookTextView);
 			var facebook = FindViewById<Button> (Resource.Id.FacebookButton);			
 			facebook.Click += delegate { LoginToFacebook(true);};
 
diff --git a/samples/Xamarin.Auth.Sample.Android/Properties/AndroidManifest.xml b/samples/Xamarin.Auth.Sample.Android/Properties/AndroidManifest.xml
index 95ae282b1..2981fce6c 100644
--- a/samples/Xamarin.Auth.Sample.Android/Properties/AndroidManifest.xml
+++ b/samples/Xamarin.Auth.Sample.Android/Properties/AndroidManifest.xml
@@ -1,7 +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="Xamarin.Auth.Sample.Android">
-	<uses-sdk android:minSdkVersion="7" />
-	<application android:label="Xamarin.Auth Sample (Android)">
-	</application>
+	<uses-sdk android:minSdkVersion="8" />
+	<application android:label="Xamarin.Auth Sample (Android)"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/samples/Xamarin.Auth.Sample.Android/Resources/Resource.designer.cs b/samples/Xamarin.Auth.Sample.Android/Resources/Resource.designer.cs
index e5d41fe45..35d317c63 100644
--- a/samples/Xamarin.Auth.Sample.Android/Resources/Resource.designer.cs
+++ b/samples/Xamarin.Auth.Sample.Android/Resources/Resource.designer.cs
@@ -1,15 +1,15 @@
 #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>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.32559
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
-[assembly: Android.Runtime.ResourceDesignerAttribute("Xamarin.Auth.Sample.Android.Resource", IsApplication=true)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("Xamarin.Auth.Sample.Android.Resource", IsApplication=true)]
 
 namespace Xamarin.Auth.Sample.Android
 {
@@ -66,9 +66,6 @@ public partial class Id
 			// aapt resource value: 0x7f050001
 			public const int FacebookButtonNoCancel = 2131034113;
 			
-			// aapt resource value: 0x7f050002
-			public const int FacebookTextView = 2131034114;
-			
 			static Id()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
diff --git a/samples/Xamarin.Auth.Sample.Android/Resources/layout/Main.axml b/samples/Xamarin.Auth.Sample.Android/Resources/layout/Main.axml
index 1a0cbd0a9..265d01c72 100644
--- a/samples/Xamarin.Auth.Sample.Android/Resources/layout/Main.axml
+++ b/samples/Xamarin.Auth.Sample.Android/Resources/layout/Main.axml
@@ -13,9 +13,4 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:id="@+id/FacebookButtonNoCancel" />
-    <TextView
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/FacebookTextView" />
 </LinearLayout>
\ No newline at end of file
diff --git a/samples/Xamarin.Auth.Sample.Android/Xamarin.Auth Sample (Android).csproj b/samples/Xamarin.Auth.Sample.Android/Xamarin.Auth Sample (Android).csproj
index ce5469319..603f2ecec 100644
--- a/samples/Xamarin.Auth.Sample.Android/Xamarin.Auth Sample (Android).csproj	
+++ b/samples/Xamarin.Auth.Sample.Android/Xamarin.Auth Sample (Android).csproj	
@@ -15,7 +15,7 @@
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AssemblyName>Xamarin.Auth.Sample.Android</AssemblyName>
-    <TargetFrameworkVersion>v4.0.3</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.2</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">