Browse Source

Various updates to support splash screens

dellis1972 14 years ago
parent
commit
07848050fc

+ 1 - 1
Samples/Android/ChaseAndEvade/Activity1.cs

@@ -6,7 +6,7 @@ using ChaseAndEvade;
 namespace MonoGame.Samples.ChaseAndEvade.Droid
 {
     [Activity(Label = "ChaseAndEvade", MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden)]
-    public class Activity1 : Activity
+    public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
     {
         protected override void OnCreate(Bundle bundle)
         {

+ 2 - 2
Samples/Android/Draw2D/Activity1.cs

@@ -3,8 +3,8 @@ using Android.OS;
 
 namespace Microsoft.Xna.Samples.Draw2D
 {
-    [Activity(Label = "Draw2D", MainLauncher = true, Icon = "@drawable/icon")]
-    public class Activity1 : Activity
+    [Activity(Label = "Draw2D", MainLauncher = true, Icon = "@drawable/icon", Theme = "@style/Theme.Splash", NoHistory = true)]
+    public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
     {
         protected override void OnCreate(Bundle bundle)
         {

+ 6 - 10
Samples/Android/Draw2D/MonoGame.Samples.Draw2D.Android.csproj

@@ -57,17 +57,11 @@
       <Link>FPSCounterComponent.cs</Link>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Layout\Main.axml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Values\Strings.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <AndroidResource Include="Resources\Drawable\Icon.png" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Properties\AndroidManifest.xml" />
+    <AndroidResource Include="Resources\Values\Styles.xml" />
+    <AndroidResource Include="Resources\Drawable\Splash.png" />
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
   </ItemGroup>
   <ItemGroup>
     <AndroidAsset Include="..\..\iOS\Draw2D\Default.png">
@@ -97,5 +91,7 @@
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Resources\Layout\" />
+  </ItemGroup>
 </Project>

+ 3 - 2
Samples/Android/Draw2D/Properties/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly">
-  <application>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="monogame.draw2d" android:versionCode="1" android:versionName="1">
+  <application android:label="draw2d">
   </application>
   <uses-sdk android:minSdkVersion="9" />
+  <uses-permission android:name="android.permission.INTERNET" />
 </manifest>

BIN
Samples/Android/Draw2D/Resources/Drawable/Icon.png


BIN
Samples/Android/Draw2D/Resources/Drawable/Splash.png


+ 0 - 7
Samples/Android/Draw2D/Resources/Layout/Main.axml

@@ -1,7 +0,0 @@
-<?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"
-    >
-</LinearLayout>

+ 6 - 17
Samples/Android/Draw2D/Resources/Resource.Designer.cs

@@ -29,32 +29,21 @@ namespace MonoGame.Samples.Draw2D.Android
 			// aapt resource value: 0x7f020000
 			public const int Icon = 2130837504;
 			
+			// aapt resource value: 0x7f020001
+			public const int Splash = 2130837505;
+			
 			private Drawable()
 			{
 			}
 		}
 		
-		public partial class Layout
+		public partial class Style
 		{
 			
 			// aapt resource value: 0x7f030000
-			public const int Main = 2130903040;
-			
-			private Layout()
-			{
-			}
-		}
-		
-		public partial class String
-		{
-			
-			// aapt resource value: 0x7f040001
-			public const int ApplicationName = 2130968577;
-			
-			// aapt resource value: 0x7f040000
-			public const int Hello = 2130968576;
+			public const int Theme_Splash = 2130903040;
 			
-			private String()
+			private Style()
 			{
 			}
 		}

+ 0 - 5
Samples/Android/Draw2D/Resources/Values/Strings.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="Hello">Hello World, Click Me!</string>
-    <string name="ApplicationName">MonoDroidXnaTouchGame</string>
-</resources>

+ 7 - 0
Samples/Android/Draw2D/Resources/Values/Styles.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="Theme.Splash" parent="android:Theme">
+    <item name="android:windowBackground">@drawable/splash</item>
+    <item name="android:windowNoTitle">true</item>
+  </style>
+</resources>

+ 1 - 1
Samples/Android/Peer2Peer/Activity1.cs

@@ -6,7 +6,7 @@ using PeerToPeer;
 namespace MonoGame.Samples.PeerToPeerGame.Droid
 {
     [Activity(Label = "Peer2Peer", MainLauncher = true, ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.KeyboardHidden)]
-    public class Activity1 : Activity
+    public class Activity1 : Microsoft.Xna.Framework.AndroidGameActivity
     {
         protected override void OnCreate(Bundle bundle)
         {

+ 0 - 1
Samples/Android/Peer2Peer/MonoGame.Samples.Peer2Peer.Android.csproj

@@ -65,7 +65,6 @@
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
      Other similar extension points exist, see Microsoft.Common.targets.

+ 2 - 1
Samples/MacOS/Peer2PeerSample/PeerToPeerGame.cs

@@ -55,7 +55,8 @@ namespace PeerToPeer
 
 
 #if ANDROID 
-		public PeerToPeerGame (Activity activity) : base (activity)
+        public PeerToPeerGame(AndroidGameActivity activity)
+            : base(activity)
 #else 
         public PeerToPeerGame ()  
 #endif

+ 16 - 4
Samples/MacOS/RenderTarget2DSample/Game1.cs

@@ -45,11 +45,24 @@ namespace RenderTarget2DSample
 		/// <summary>
 		/// The constructor for our Game1 class.
 		/// </summary>
-		public Game1 ()
+#if ANDROID
+        public Game1(AndroidGameActivity activity)
+            : base(activity)
+#else 
+        public Game1 ()  
+#endif
 		{
 			// Create the GraphicsDeviceManager for our game.
 			graphics = new GraphicsDeviceManager (this);
 
+#if ANDROID || IOS
+            graphics.IsFullScreen = true;
+#else
+			graphics.PreferredBackBufferWidth = screenWidth;
+			graphics.PreferredBackBufferHeight = screenHeight;
+			graphics.IsFullScreen = false;
+#endif
+
 			// Set the root directory of the game's ContentManager to the "Content" folder.
 			Content.RootDirectory = "Content";
 		}
@@ -72,8 +85,7 @@ namespace RenderTarget2DSample
 		/// all of your content.
 		/// </summary>
 		protected override void LoadContent ()
-		{
-
+		{           
 			// Create a new SpriteBatch, which can be used to draw textures.
 			spriteBatch = new SpriteBatch (GraphicsDevice);
 
@@ -82,7 +94,7 @@ namespace RenderTarget2DSample
 			// has no depth buffer or stencil buffer.
 			renderTarget = new RenderTarget2D (GraphicsDevice, GraphicsDevice.PresentationParameters.BackBufferWidth,
 				GraphicsDevice.PresentationParameters.BackBufferHeight, false, SurfaceFormat.Color, DepthFormat.None);
-
+            
 			// Load in the picture of Seamus.
 			mooTheMerciless = Content.Load<Texture2D> ("MooTheMerciless");
 

+ 18 - 9
Samples/MonoGame.Samples.Android.sln

@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Draw2D.And
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Peer2Peer.Android", "Android\Peer2Peer\MonoGame.Samples.Peer2Peer.Android.csproj", "{56F6C06F-6F07-402E-89A5-39EDB037A516}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenderTarget2DSample", "Android\RenderTarget2DSample\RenderTarget2DSample.csproj", "{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,22 +23,29 @@ Global
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{565129E0-4EE5-4F6F-B403-C3484C9740BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.Build.0 = Release|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F05F90DC-DD37-4967-A96A-8D36C1C23E81}.Release|Any CPU.Build.0 = Release|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{616BBFA6-52F2-40A1-AA76-1CF2BD6390D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56F6C06F-6F07-402E-89A5-39EDB037A516}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1786F36B-8090-48C7-B2E8-4A3D0356D0E6}.Release|Any CPU.Deploy.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = ..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj

+ 63 - 4
Samples/MonoGame.Samples.Windows.sln

@@ -1,13 +1,72 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.Windows", "..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Samples.Draw2D.Windows", "Windows\Draw2D\MonoGame.Samples.Draw2D.Windows.csproj", "{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Debug|Any CPU = Debug|Any CPU
 		Debug|iPhone = Debug|iPhone
+		Debug|iPhoneSimulator = Debug|iPhoneSimulator
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|iPhone = Release|iPhone
+		Release|iPhoneSimulator = Release|iPhoneSimulator
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.ActiveCfg = Debug|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.Build.0 = Debug|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.ActiveCfg = Release|x86
+		{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhone.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|x86.ActiveCfg = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Debug|x86.Build.0 = Debug|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Any CPU.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhone.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|iPhoneSimulator.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|Mixed Platforms.Build.0 = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|x86.ActiveCfg = Release|x86
+		{8CFEF1FE-9E32-43EB-A730-EB3AACDC77B1}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

+ 1 - 1
Samples/Windows/Draw2D/MonoGame.Samples.Draw2D.Windows.csproj

@@ -34,7 +34,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
+    <ProjectReference Include="..\..\..\..\MonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
       <Project>{7DE47032-A904-4C29-BD22-2D235E8D91BA}</Project>
       <Name>MonoGame.Framework.Windows</Name>
     </ProjectReference>

+ 2 - 1
Samples/iOS/ChaseAndEvade/ChaseAndEvadeGame.cs

@@ -132,7 +132,8 @@ namespace ChaseAndEvade
 	#region Initialization
 
 #if ANDROID 
-		public ChaseAndEvadeGame (Activity activity) : base (activity)
+        public ChaseAndEvadeGame(AndroidGameActivity activity)
+            : base(activity)
 #else 
         public ChaseAndEvadeGame ()  
 #endif

+ 2 - 2
Samples/iOS/Draw2D/FPSCounterComponent.cs

@@ -42,8 +42,8 @@ namespace Microsoft.Xna.Samples.Draw2D
 
             string fps = string.Format("fps: {0} mem : {1}", frameRate, GC.GetTotalMemory(false));
 
-            spriteBatch.DrawString(spriteFont, fps, new Vector2(1, 1), Color.Black);
-            spriteBatch.DrawString(spriteFont, fps, new Vector2(0, 0), Color.White);
+            //spriteBatch.DrawString(spriteFont, fps, new Vector2(1, 1), Color.Black);
+            //spriteBatch.DrawString(spriteFont, fps, new Vector2(0, 0), Color.White);
         }
     }
 }

+ 7 - 6
Samples/iOS/Draw2D/Game1.cs

@@ -28,7 +28,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 		FPSCounterComponent fps;
 		
 #if ANDROID 
-		public Game1 (Activity activity) : base (activity)
+		public Game1 (AndroidGameActivity activity) : base (activity)
 #else 
         public Game1 ()  
 #endif
@@ -110,7 +110,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 		protected override void Draw (GameTime gameTime)
 		{
 			graphics.GraphicsDevice.Clear (Color.CornflowerBlue);
-
+            
 			// Draw without blend
 			spriteBatch.Begin (SpriteSortMode.Deferred, BlendState.Opaque);			
 			spriteBatch.Draw (texture, new Vector2 (250,20), Color.White);	
@@ -121,13 +121,13 @@ namespace Microsoft.Xna.Samples.Draw2D
 			spriteBatch.Draw (texture, new Vector2 (250,110), Color.White);
 			spriteBatch.Draw (texture, new Vector2 (260,120), Color.White);
 			spriteBatch.End ();
-
+            
 			spriteBatch.Begin ();
 
 			// Normal draw
 			// TODO spriteBatch.Draw (ball, new Vector2 (200,300), Color.White);	
 			// TODO spriteBatch.Draw (ball, new Vector2 (200,300), null, Color.Yellow, 0.0f, new Vector2 (5,5), 1.0f, SpriteEffects.None, 0);	
-
+            
 			// Normal draw
 			spriteBatch.Draw (texture, new Vector2 (10,390), Color.White);		
 			// Draw stretching
@@ -148,12 +148,13 @@ namespace Microsoft.Xna.Samples.Draw2D
 			spriteBatch.Draw (texture, new Rectangle (150,390,texture.Width,texture.Height), null, Color.White, 0.0f, Vector2.Zero, SpriteEffects.FlipVertically, 0);	
 			// Flip horizontaly and verticaly
 			spriteBatch.Draw (texture, new Rectangle (220,390,texture.Width,texture.Height), null, Color.White, 0.0f, Vector2.Zero, SpriteEffects.FlipHorizontally | SpriteEffects.FlipVertically, 0);	
-
+            
 			base.Draw (gameTime);
 
 			spriteBatch.End ();
 
 
+            
 			// Now let's try some scissoring
 			spriteBatch.Begin ();
 
@@ -166,7 +167,7 @@ namespace Microsoft.Xna.Samples.Draw2D
 			spriteBatch.End ();
 
             spriteBatch.GraphicsDevice.RasterizerState.ScissorTestEnable = false;
-
+            
 
 		}
 	}

+ 9 - 9
StarterKits/Android/Cards/Resources/Resource.designer.cs

@@ -1,12 +1,12 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      Mono Runtime Version: 4.0.30319.1
-// 
-//      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.235
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
 namespace Blackjack.Android
 {

+ 1 - 1
StarterKits/Android/Platformer/Resources/Resource.designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace PlatformerTwo
+namespace Platformer
 {
 	
 	

+ 0 - 2
StarterKits/MonoGame.StarterKits.Android.sln

@@ -28,11 +28,9 @@ Global
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BA9476CF-99BA-4D03-92F2-73D2C5E58883}.Release|Any CPU.Build.0 = Release|Any CPU
 		{25465464-21B2-4C14-8E3C-3B9F8C131484}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25465464-21B2-4C14-8E3C-3B9F8C131484}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25465464-21B2-4C14-8E3C-3B9F8C131484}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{25465464-21B2-4C14-8E3C-3B9F8C131484}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9B7D8FCF-5A3B-48D6-B9E7-4C3C0D0632F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B7D8FCF-5A3B-48D6-B9E7-4C3C0D0632F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B7D8FCF-5A3B-48D6-B9E7-4C3C0D0632F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9B7D8FCF-5A3B-48D6-B9E7-4C3C0D0632F6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9FA77471-A020-4452-928B-7D72BF15C991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+ 3 - 1
StarterKits/iOS/Platformer/PlatformerGame.cs

@@ -203,7 +203,9 @@ namespace Platformer
 
             level.Draw(gameTime, spriteBatch);
 
-            DrawHud();
+            DrawHud();
+
+            GamePad.Draw(gameTime, spriteBatch);
 
             spriteBatch.End();