فهرست منبع

Updated the Android samples to include a splash screen

dellis1972 13 سال پیش
والد
کامیت
cb152038d7
24فایلهای تغییر یافته به همراه199 افزوده شده و 61 حذف شده
  1. 1 1
      Samples/Android/ChaseAndEvade/Activity1.cs
  2. 9 0
      Samples/Android/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Android.csproj
  3. BIN
      Samples/Android/ChaseAndEvade/Resources/Drawable/Icon.png
  4. BIN
      Samples/Android/ChaseAndEvade/Resources/Drawable/Splash.png
  5. 51 0
      Samples/Android/ChaseAndEvade/Resources/Resource.Designer.cs
  6. 7 0
      Samples/Android/ChaseAndEvade/Resources/Values/Styles.xml
  7. 1 1
      Samples/Android/Draw2D/Activity1.cs
  8. 0 3
      Samples/Android/Draw2D/MonoGame.Samples.Draw2D.Android.csproj
  9. 5 1
      Samples/Android/Peer2Peer/Activity1.cs
  10. 9 0
      Samples/Android/Peer2Peer/MonoGame.Samples.Peer2Peer.Android.csproj
  11. BIN
      Samples/Android/Peer2Peer/Resources/Drawable/Icon.png
  12. BIN
      Samples/Android/Peer2Peer/Resources/Drawable/Splash.png
  13. 51 0
      Samples/Android/Peer2Peer/Resources/Resource.Designer.cs
  14. 7 0
      Samples/Android/Peer2Peer/Resources/Values/Styles.xml
  15. 3 2
      Samples/Android/RenderTarget2D/Activity1.cs
  16. 12 6
      Samples/Android/RenderTarget2D/MonoGame.Samples.RenderTarget2D.Android.csproj
  17. 6 0
      Samples/Android/RenderTarget2D/Properties/AndroidManifest.xml
  18. 15 23
      Samples/Android/RenderTarget2D/Resources/Resource.designer.cs
  19. BIN
      Samples/Android/RenderTarget2D/Resources/drawable/Icon.png
  20. BIN
      Samples/Android/RenderTarget2D/Resources/drawable/Splash.png
  21. 0 8
      Samples/Android/RenderTarget2D/Resources/layout/Main.axml
  22. 0 4
      Samples/Android/RenderTarget2D/Resources/values/Strings.xml
  23. 7 0
      Samples/Android/RenderTarget2D/Resources/values/Styles.xml
  24. 15 12
      Samples/MonoGame.Samples.Android.sln

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

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

+ 9 - 0
Samples/Android/ChaseAndEvade/MonoGame.Samples.ChaseAndEvade.Android.csproj

@@ -78,6 +78,15 @@
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Splash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\Styles.xml" />
+  </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.

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


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


+ 51 - 0
Samples/Android/ChaseAndEvade/Resources/Resource.Designer.cs

@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <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 MonoGame.Samples.ChaseAndEvade.Android
+{
+	
+	
+	public partial class Resource
+	{
+		
+		public partial class Attribute
+		{
+			
+			private Attribute()
+			{
+			}
+		}
+		
+		public partial class Drawable
+		{
+			
+			// aapt resource value: 0x7f020000
+			public const int Icon = 2130837504;
+			
+			// aapt resource value: 0x7f020001
+			public const int Splash = 2130837505;
+			
+			private Drawable()
+			{
+			}
+		}
+		
+		public partial class Style
+		{
+			
+			// aapt resource value: 0x7f030000
+			public const int Theme_Splash = 2130903040;
+			
+			private Style()
+			{
+			}
+		}
+	}
+}

+ 7 - 0
Samples/Android/ChaseAndEvade/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/Draw2D/Activity1.cs

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

+ 0 - 3
Samples/Android/Draw2D/MonoGame.Samples.Draw2D.Android.csproj

@@ -64,9 +64,6 @@
     <AndroidResource Include="Resources\Drawable\Icon.png" />
   </ItemGroup>
   <ItemGroup>
-    <AndroidAsset Include="..\..\iOS\Draw2D\Default.png">
-      <Link>Default.png</Link>
-    </AndroidAsset>
     <AndroidAsset Include="..\..\iOS\Draw2D\Content\monogameicon.png">
       <Link>Assets\Content\monogameicon.png</Link>
     </AndroidAsset>

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

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

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

@@ -90,4 +90,13 @@
   <ItemGroup>
     <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Drawable\Splash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\Values\Styles.xml" />
+  </ItemGroup>
 </Project>

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


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


+ 51 - 0
Samples/Android/Peer2Peer/Resources/Resource.Designer.cs

@@ -0,0 +1,51 @@
+//------------------------------------------------------------------------------
+// <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 MonoGame.Samples.Peer2Peer.Android
+{
+	
+	
+	public partial class Resource
+	{
+		
+		public partial class Attribute
+		{
+			
+			private Attribute()
+			{
+			}
+		}
+		
+		public partial class Drawable
+		{
+			
+			// aapt resource value: 0x7f020000
+			public const int Icon = 2130837504;
+			
+			// aapt resource value: 0x7f020001
+			public const int Splash = 2130837505;
+			
+			private Drawable()
+			{
+			}
+		}
+		
+		public partial class Style
+		{
+			
+			// aapt resource value: 0x7f030000
+			public const int Theme_Splash = 2130903040;
+			
+			private Style()
+			{
+			}
+		}
+	}
+}

+ 7 - 0
Samples/Android/Peer2Peer/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>

+ 3 - 2
Samples/Android/RenderTarget2D/Activity1.cs

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

+ 12 - 6
Samples/Android/RenderTarget2D/MonoGame.Samples.RenderTarget2D.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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>
@@ -15,6 +15,7 @@
     <AndroidApplication>True</AndroidApplication>
     <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
     <AssemblyName>MonoGame.Samples.RenderTarget2D.Android</AssemblyName>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -56,11 +57,6 @@
     <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" />
   <ItemGroup>
     <AndroidAsset Include="..\..\MacOS\RenderTarget2DSample\Content\MooTheMerciless.xnb">
@@ -76,4 +72,14 @@
       <Name>MonoGame.Framework.Android</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\Splash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\Styles.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Properties\AndroidManifest.xml" />
+    <AndroidResource Include="Resources\drawable\Icon.png" />
+  </ItemGroup>
 </Project>

+ 6 - 0
Samples/Android/RenderTarget2D/Properties/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+  </application>
+  <uses-sdk android:minSdkVersion="4" />
+</manifest>

+ 15 - 23
Samples/Android/RenderTarget2D/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 MonoGame.Samples.RenderTarget2D.Android
 {
@@ -29,29 +29,21 @@ namespace MonoGame.Samples.RenderTarget2D.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: 0x7f040000
-			public const int app_name = 2130968576;
+			public const int Theme_Splash = 2130903040;
 			
-			private String()
+			private Style()
 			{
 			}
 		}

BIN
Samples/Android/RenderTarget2D/Resources/drawable/Icon.png


BIN
Samples/Android/RenderTarget2D/Resources/drawable/Splash.png


+ 0 - 8
Samples/Android/RenderTarget2D/Resources/layout/Main.axml

@@ -1,8 +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>
-

+ 0 - 4
Samples/Android/RenderTarget2D/Resources/values/Strings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="app_name">MonoGame.Samples.RenderTarget2D.Android</string>
-</resources>

+ 7 - 0
Samples/Android/RenderTarget2D/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>

+ 15 - 12
Samples/MonoGame.Samples.Android.sln

@@ -23,26 +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
-		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.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}.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
+		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DEDD20B5-8F83-46FD-AD05-8F8FCC49FCD6}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = ..\..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Android.csproj