[CatapultNetWars]Fix single player by removing the background thread loading.

CatapultNetWars/Core/Networking/CatapultNetWars.code-workspace

@@ -7,7 +7,7 @@
 			"path": "../../../MonoGame.Xna.Framework.Net"
 		},
 		{
-			"path": "../../../NetworkStateManagement"
+			"path": "../../../CatapultWars"
 		}
 	],
 	"settings": {}

CatapultNetWars/Core/Screens/InstructionsScreen.cs

@@ -9,7 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading;
+// using System.Threading;
 
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework;
@@ -22,9 +22,7 @@ namespace CatapultGame
 	{
 		Texture2D background;
 		SpriteFont font;
-		bool isLoading;
-		GameplayScreen gameplayScreen;
-		System.Threading.Thread thread;
+		// Background threaded loading removed; we load on the main thread.
 
 		public InstructionsScreen ()
 		{
@@ -42,61 +40,25 @@ namespace CatapultGame
 
 		public override void Update (GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen)
 		{
-			// If additional thread is running, skip
-			if (null != thread) {
-				// If additional thread finished loading and the screen is not exiting
-				if (thread.ThreadState == System.Threading.ThreadState.Stopped  && !IsExiting) {
-					isLoading = false;
-
-					// Exit the screen and show the gameplay screen 
-					// with pre-loaded assets
-					ExitScreen ();
-					ScreenManager.AddScreen (gameplayScreen, null);
-				}
-			}
-
 			base.Update (gameTime, otherScreenHasFocus, coveredByOtherScreen);
 		}
 
 		public override void HandleInput (InputState input)
 		{
-			if (isLoading == true)
-            {
-                // Exit the screen and show the gameplay screen 
-					// with pre-loaded assets
-				ExitScreen ();
-				ScreenManager.AddScreen (gameplayScreen, null);
-					
-				base.HandleInput (input);
-				return;
-			}
-
 			PlayerIndex player;
 			if (input.IsNewKeyPress (Keys.Space, ControllingPlayer, out player) ||
 			    input.IsNewKeyPress (Keys.Enter, ControllingPlayer, out player) ||
 			    input.MouseGesture.HasFlag(MouseGestureType.LeftClick) ||
 			    input.IsNewButtonPress (Buttons.Start, ControllingPlayer, out player)) {
-				// Create a new instance of the gameplay screen
-				gameplayScreen = new GameplayScreen ();
-				gameplayScreen.ScreenManager = ScreenManager;
-
-                // Start loading the resources in additional thread    
-				thread = new System.Threading.Thread (new System.Threading.ThreadStart (gameplayScreen.LoadAssets));
-				isLoading = true;
-				// start it
-				thread.Start ();
+				// Start gameplay immediately on the main thread
+				ExitScreen();
+				ScreenManager.AddScreen(new GameplayScreen(), null);
 			}
 
 			foreach (var gesture in input.Gestures) {
 				if (gesture.GestureType == GestureType.Tap) {
-					// Create a new instance of the gameplay screen
-					gameplayScreen = new GameplayScreen ();
-					gameplayScreen.ScreenManager = ScreenManager;
-						
-					// Start loading the resources in additional thread
-					thread = new System.Threading.Thread (new System.Threading.ThreadStart (gameplayScreen.LoadAssets));
-					isLoading = true;
-					thread.Start ();				
+					ExitScreen();
+					ScreenManager.AddScreen(new GameplayScreen(), null);
 				}
 			}
 
@@ -113,17 +75,7 @@ namespace CatapultGame
 			spriteBatch.Draw (background, new Vector2 (0, 0),
 					new Color (255, 255, 255, TransitionAlpha));
 
-			// If loading gameplay screen resource in the 
-			// background show "Loading..." text
-			if (isLoading) {
-				string text = "Loading...";
-				Vector2 size = font.MeasureString (text);
-				Vector2 position = new Vector2 (
-							(ScreenManager.GraphicsDevice.Viewport.Width - size.X) / 2,
-							(ScreenManager.GraphicsDevice.Viewport.Height - size.Y) / 2);
-				spriteBatch.DrawString (font, text, position, Color.Black);
-				spriteBatch.DrawString (font, text, position - new Vector2 (-4, 4), new Color (255f, 150f, 0f));
-			}
+
 
 			spriteBatch.End ();
 		}

CatapultNetWars/Platforms/Android/AndroidManifest.xml

@@ -1,7 +1,8 @@
 <?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="CatapultNetWars.CatapultNetWars">
-	<application android:label="CatapultNetWars" android:icon="@drawable/icon"></application>
-	<uses-sdk android:minSdkVersion="21" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="CatapultWars" android:versionCode="1" android:versionName="1.0">
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="34" />
+	<uses-feature android:glEsVersion="0x00020000" android:required="true" />
+	<application android:label="@string/app_name" android:icon="@drawable/icon"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.GET_ACCOUNTS" />
 	<uses-permission android:name="android.permission.INTERNET" />

CatapultNetWars/Platforms/Android/MainActivity.cs

@@ -11,16 +11,29 @@ using Android.Content.PM;
 
 namespace CatapultGame
 {
+    [Activity(
+        Label = "@string/app_name",
+        MainLauncher = true,
+        Icon = "@drawable/icon",
+        AlwaysRetainTaskState = true,
+        LaunchMode = LaunchMode.SingleInstance,
+        ScreenOrientation = ScreenOrientation.SensorLandscape,
+        ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden
+    )]
     public class MainActivity : AndroidGameActivity
     {
         private CatapultGame _game;
+        private View _view;
 
         protected override void OnCreate(Bundle bundle)
         {
             base.OnCreate(bundle);
 
             _game = new CatapultGame();
-            SetContentView((View)_game.Services.GetService(typeof(View)));
+
+            _view = _game.Services.GetService(typeof(View)) as View;
+            SetContentView(_view);
+
             _game.Run();
         }
     }

CatapultNetWars/Platforms/Android/Properties/Resources.Designer.cs

@@ -1,514 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.488
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace CatapultGame
-{
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CatapaultNetWars.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Back.
-        /// </summary>
-        internal static string Back {
-            get {
-                return ResourceManager.GetString("Back", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to end this session?.
-        /// </summary>
-        internal static string ConfirmEndSession {
-            get {
-                return ResourceManager.GetString("ConfirmEndSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to exit this sample?.
-        /// </summary>
-        internal static string ConfirmExitSample {
-            get {
-                return ResourceManager.GetString("ConfirmExitSample", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to start the game,.
-        /// </summary>
-        internal static string ConfirmForceStartGame {
-            get {
-                return ResourceManager.GetString("ConfirmForceStartGame", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to leave this session?.
-        /// </summary>
-        internal static string ConfirmLeaveSession {
-            get {
-                return ResourceManager.GetString("ConfirmLeaveSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Online gameplay is not available in trial mode..
-        /// </summary>
-        internal static string ConfirmMarketplace {
-            get {
-                return ResourceManager.GetString("ConfirmMarketplace", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Are you sure you want to quit this game?.
-        /// </summary>
-        internal static string ConfirmQuitGame {
-            get {
-                return ResourceManager.GetString("ConfirmQuitGame", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Create Session.
-        /// </summary>
-        internal static string CreateSession {
-            get {
-                return ResourceManager.GetString("CreateSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to End Session.
-        /// </summary>
-        internal static string EndSession {
-            get {
-                return ResourceManager.GetString("EndSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lost connection to the network session.
-        /// </summary>
-        internal static string ErrorDisconnected {
-            get {
-                return ResourceManager.GetString("ErrorDisconnected", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You must sign in a suitable gamer profile.
-        /// </summary>
-        internal static string ErrorGamerPrivilege {
-            get {
-                return ResourceManager.GetString("ErrorGamerPrivilege", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Host ended the session.
-        /// </summary>
-        internal static string ErrorHostEndedSession {
-            get {
-                return ResourceManager.GetString("ErrorHostEndedSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to There was an error while.
-        /// </summary>
-        internal static string ErrorNetwork {
-            get {
-                return ResourceManager.GetString("ErrorNetwork", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Networking is turned.
-        /// </summary>
-        internal static string ErrorNetworkNotAvailable {
-            get {
-                return ResourceManager.GetString("ErrorNetworkNotAvailable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Host kicked you out of the session.
-        /// </summary>
-        internal static string ErrorRemovedByHost {
-            get {
-                return ResourceManager.GetString("ErrorRemovedByHost", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This session is already full.
-        /// </summary>
-        internal static string ErrorSessionFull {
-            get {
-                return ResourceManager.GetString("ErrorSessionFull", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Session not found. It may have ended,.
-        /// </summary>
-        internal static string ErrorSessionNotFound {
-            get {
-                return ResourceManager.GetString("ErrorSessionNotFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You must wait for the host to return to.
-        /// </summary>
-        internal static string ErrorSessionNotJoinable {
-            get {
-                return ResourceManager.GetString("ErrorSessionNotJoinable", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to This functionality is not available in trial mode.
-        /// </summary>
-        internal static string ErrorTrialMode {
-            get {
-                return ResourceManager.GetString("ErrorTrialMode", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to An unknown error occurred.
-        /// </summary>
-        internal static string ErrorUnknown {
-            get {
-                return ResourceManager.GetString("ErrorUnknown", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Exit.
-        /// </summary>
-        internal static string Exit {
-            get {
-                return ResourceManager.GetString("Exit", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Find Sessions.
-        /// </summary>
-        internal static string FindSessions {
-            get {
-                return ResourceManager.GetString("FindSessions", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to  (host).
-        /// </summary>
-        internal static string HostSuffix {
-            get {
-                return ResourceManager.GetString("HostSuffix", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Join Session.
-        /// </summary>
-        internal static string JoinSession {
-            get {
-                return ResourceManager.GetString("JoinSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Leave Session.
-        /// </summary>
-        internal static string LeaveSession {
-            get {
-                return ResourceManager.GetString("LeaveSession", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Loading.
-        /// </summary>
-        internal static string Loading {
-            get {
-                return ResourceManager.GetString("Loading", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Lobby.
-        /// </summary>
-        internal static string Lobby {
-            get {
-                return ResourceManager.GetString("Lobby", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Main Menu.
-        /// </summary>
-        internal static string MainMenu {
-            get {
-                return ResourceManager.GetString("MainMenu", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to .
-        /// </summary>
-        internal static string MessageBoxUsage {
-            get {
-                return ResourceManager.GetString("MessageBoxUsage", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} joined.
-        /// </summary>
-        internal static string MessageGamerJoined {
-            get {
-                return ResourceManager.GetString("MessageGamerJoined", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to {0} left.
-        /// </summary>
-        internal static string MessageGamerLeft {
-            get {
-                return ResourceManager.GetString("MessageGamerLeft", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Networking....
-        /// </summary>
-        internal static string NetworkBusy {
-            get {
-                return ResourceManager.GetString("NetworkBusy", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to No sessions found.
-        /// </summary>
-        internal static string NoSessionsFound {
-            get {
-                return ResourceManager.GetString("NoSessionsFound", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Paused.
-        /// </summary>
-        internal static string Paused {
-            get {
-                return ResourceManager.GetString("Paused", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to LIVE.
-        /// </summary>
-        internal static string PlayerMatch {
-            get {
-                return ResourceManager.GetString("PlayerMatch", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Quit Game.
-        /// </summary>
-        internal static string QuitGame {
-            get {
-                return ResourceManager.GetString("QuitGame", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Resume Game.
-        /// </summary>
-        internal static string ResumeGame {
-            get {
-                return ResourceManager.GetString("ResumeGame", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Return to Lobby.
-        /// </summary>
-        internal static string ReturnToLobby {
-            get {
-                return ResourceManager.GetString("ReturnToLobby", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Single Player.
-        /// </summary>
-        internal static string SinglePlayer {
-            get {
-                return ResourceManager.GetString("SinglePlayer", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to even though not all players are ready?.
-        /// </summary>
-        internal static string String {
-            get {
-                return ResourceManager.GetString("String", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Would you like to purchase this game?.
-        /// </summary>
-        internal static string String1 {
-            get {
-                return ResourceManager.GetString("String1", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to in order to access this functionality.
-        /// </summary>
-        internal static string String2 {
-            get {
-                return ResourceManager.GetString("String2", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to accessing the network.
-        /// </summary>
-        internal static string String3 {
-            get {
-                return ResourceManager.GetString("String3", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to off or not connected.
-        /// </summary>
-        internal static string String4 {
-            get {
-                return ResourceManager.GetString("String4", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to or there may be no network connectivity.
-        /// </summary>
-        internal static string String5 {
-            get {
-                return ResourceManager.GetString("String5", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to between the local machine and session host.
-        /// </summary>
-        internal static string String6 {
-            get {
-                return ResourceManager.GetString("String6", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to the lobby before you can join this session.
-        /// </summary>
-        internal static string String7 {
-            get {
-                return ResourceManager.GetString("String7", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to A button, Space, Enter = ok.
-        /// </summary>
-        internal static string String8 {
-            get {
-                return ResourceManager.GetString("String8", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to B button, Esc = cancel.
-        /// </summary>
-        internal static string String9 {
-            get {
-                return ResourceManager.GetString("String9", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to System Link.
-        /// </summary>
-        internal static string SystemLink {
-            get {
-                return ResourceManager.GetString("SystemLink", resourceCulture);
-            }
-        }
-    }
-}

CatapultNetWars/Platforms/Android/Properties/Resources.resx

@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Back" xml:space="preserve">
-    <value>Back</value>
-  </data>
-  <data name="ConfirmEndSession" xml:space="preserve">
-    <value>Are you sure you want to end this session?</value>
-  </data>
-  <data name="ConfirmExitSample" xml:space="preserve">
-    <value>Are you sure you want to exit this sample?</value>
-  </data>
-  <data name="ConfirmForceStartGame" xml:space="preserve">
-    <value>Are you sure you want to start the game,</value>
-  </data>
-  <data name="ConfirmLeaveSession" xml:space="preserve">
-    <value>Are you sure you want to leave this session?</value>
-  </data>
-  <data name="ConfirmMarketplace" xml:space="preserve">
-    <value>Online gameplay is not available in trial mode.</value>
-  </data>
-  <data name="ConfirmQuitGame" xml:space="preserve">
-    <value>Are you sure you want to quit this game?</value>
-  </data>
-  <data name="CreateSession" xml:space="preserve">
-    <value>Create Session</value>
-  </data>
-  <data name="EndSession" xml:space="preserve">
-    <value>End Session</value>
-  </data>
-  <data name="ErrorDisconnected" xml:space="preserve">
-    <value>Lost connection to the network session</value>
-  </data>
-  <data name="ErrorGamerPrivilege" xml:space="preserve">
-    <value>You must sign in a suitable gamer profile</value>
-  </data>
-  <data name="ErrorHostEndedSession" xml:space="preserve">
-    <value>Host ended the session</value>
-  </data>
-  <data name="ErrorNetwork" xml:space="preserve">
-    <value>There was an error while</value>
-  </data>
-  <data name="ErrorNetworkNotAvailable" xml:space="preserve">
-    <value>Networking is turned</value>
-  </data>
-  <data name="ErrorRemovedByHost" xml:space="preserve">
-    <value>Host kicked you out of the session</value>
-  </data>
-  <data name="ErrorSessionFull" xml:space="preserve">
-    <value>This session is already full</value>
-  </data>
-  <data name="ErrorSessionNotFound" xml:space="preserve">
-    <value>Session not found. It may have ended,</value>
-  </data>
-  <data name="ErrorSessionNotJoinable" xml:space="preserve">
-    <value>You must wait for the host to return to</value>
-  </data>
-  <data name="ErrorTrialMode" xml:space="preserve">
-    <value>This functionality is not available in trial mode</value>
-  </data>
-  <data name="ErrorUnknown" xml:space="preserve">
-    <value>An unknown error occurred</value>
-  </data>
-  <data name="Exit" xml:space="preserve">
-    <value>Exit</value>
-  </data>
-  <data name="FindSessions" xml:space="preserve">
-    <value>Find Sessions</value>
-  </data>
-  <data name="HostSuffix" xml:space="preserve">
-    <value> (host)</value>
-  </data>
-  <data name="JoinSession" xml:space="preserve">
-    <value>Join Session</value>
-  </data>
-  <data name="LeaveSession" xml:space="preserve">
-    <value>Leave Session</value>
-  </data>
-  <data name="Loading" xml:space="preserve">
-    <value>Loading</value>
-  </data>
-  <data name="Lobby" xml:space="preserve">
-    <value>Lobby</value>
-  </data>
-  <data name="MainMenu" xml:space="preserve">
-    <value>Main Menu</value>
-  </data>
-  <data name="MessageBoxUsage" xml:space="preserve">
-    <value />
-  </data>
-  <data name="MessageGamerJoined" xml:space="preserve">
-    <value>{0} joined</value>
-  </data>
-  <data name="MessageGamerLeft" xml:space="preserve">
-    <value>{0} left</value>
-  </data>
-  <data name="NetworkBusy" xml:space="preserve">
-    <value>Networking...</value>
-  </data>
-  <data name="NoSessionsFound" xml:space="preserve">
-    <value>No sessions found</value>
-  </data>
-  <data name="Paused" xml:space="preserve">
-    <value>Paused</value>
-  </data>
-  <data name="PlayerMatch" xml:space="preserve">
-    <value>LIVE</value>
-  </data>
-  <data name="QuitGame" xml:space="preserve">
-    <value>Quit Game</value>
-  </data>
-  <data name="ResumeGame" xml:space="preserve">
-    <value>Resume Game</value>
-  </data>
-  <data name="ReturnToLobby" xml:space="preserve">
-    <value>Return to Lobby</value>
-  </data>
-  <data name="SinglePlayer" xml:space="preserve">
-    <value>Single Player</value>
-  </data>
-  <data name="String" xml:space="preserve">
-    <value>even though not all players are ready?</value>
-  </data>
-  <data name="String1" xml:space="preserve">
-    <value>Would you like to purchase this game?</value>
-  </data>
-  <data name="String2" xml:space="preserve">
-    <value>in order to access this functionality</value>
-  </data>
-  <data name="String3" xml:space="preserve">
-    <value>accessing the network</value>
-  </data>
-  <data name="String4" xml:space="preserve">
-    <value>off or not connected</value>
-  </data>
-  <data name="String5" xml:space="preserve">
-    <value>or there may be no network connectivity</value>
-  </data>
-  <data name="String6" xml:space="preserve">
-    <value>between the local machine and session host</value>
-  </data>
-  <data name="String7" xml:space="preserve">
-    <value>the lobby before you can join this session</value>
-  </data>
-  <data name="String8" xml:space="preserve">
-    <value>A button, Space, Enter = ok</value>
-  </data>
-  <data name="String9" xml:space="preserve">
-    <value>B button, Esc = cancel</value>
-  </data>
-  <data name="SystemLink" xml:space="preserve">
-    <value>System Link</value>
-  </data>
-</root>

CatapultNetWars/Platforms/Android/Resources/AboutResources.txt

@@ -1,44 +0,0 @@
-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.

CatapultNetWars/Platforms/Android/Resources/Resource.designer.cs

@@ -1,193 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.586
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: Android.Runtime.ResourceDesignerAttribute("CatapultWarsNet.Resource", IsApplication=true)]
-
-namespace CatapultWarsNet
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues ();
-		}
-		
-		public static void UpdateIdValues()
-		{
-		}
-		
-		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 String
-		{
-			
-			// aapt resource value: 0x7f030000
-			public const int Back = 2130903040;
-			
-			// aapt resource value: 0x7f030001
-			public const int ConfirmEndSession = 2130903041;
-			
-			// aapt resource value: 0x7f030002
-			public const int ConfirmExitSample = 2130903042;
-			
-			// aapt resource value: 0x7f030003
-			public const int ConfirmForceStartGame = 2130903043;
-			
-			// aapt resource value: 0x7f030004
-			public const int ConfirmLeaveSession = 2130903044;
-			
-			// aapt resource value: 0x7f030005
-			public const int ConfirmMarketplace = 2130903045;
-			
-			// aapt resource value: 0x7f030006
-			public const int ConfirmQuitGame = 2130903046;
-			
-			// aapt resource value: 0x7f030007
-			public const int CreateSession = 2130903047;
-			
-			// aapt resource value: 0x7f030008
-			public const int EndSession = 2130903048;
-			
-			// aapt resource value: 0x7f030009
-			public const int ErrorDisconnected = 2130903049;
-			
-			// aapt resource value: 0x7f03000a
-			public const int ErrorGamerPrivilege = 2130903050;
-			
-			// aapt resource value: 0x7f03000b
-			public const int ErrorHostEndedSession = 2130903051;
-			
-			// aapt resource value: 0x7f03000c
-			public const int ErrorNetwork = 2130903052;
-			
-			// aapt resource value: 0x7f03000d
-			public const int ErrorNetworkNotAvailable = 2130903053;
-			
-			// aapt resource value: 0x7f03000e
-			public const int ErrorRemovedByHost = 2130903054;
-			
-			// aapt resource value: 0x7f03000f
-			public const int ErrorSessionFull = 2130903055;
-			
-			// aapt resource value: 0x7f030010
-			public const int ErrorSessionNotFound = 2130903056;
-			
-			// aapt resource value: 0x7f030011
-			public const int ErrorSessionNotJoinable = 2130903057;
-			
-			// aapt resource value: 0x7f030012
-			public const int ErrorTrialMode = 2130903058;
-			
-			// aapt resource value: 0x7f030013
-			public const int ErrorUnknown = 2130903059;
-			
-			// aapt resource value: 0x7f030014
-			public const int Exit = 2130903060;
-			
-			// aapt resource value: 0x7f030015
-			public const int FindSessions = 2130903061;
-			
-			// aapt resource value: 0x7f030016
-			public const int HostSuffix = 2130903062;
-			
-			// aapt resource value: 0x7f030017
-			public const int JoinSession = 2130903063;
-			
-			// aapt resource value: 0x7f030018
-			public const int LeaveSession = 2130903064;
-			
-			// aapt resource value: 0x7f030019
-			public const int Loading = 2130903065;
-			
-			// aapt resource value: 0x7f03001a
-			public const int Lobby = 2130903066;
-			
-			// aapt resource value: 0x7f03001b
-			public const int MainMenu = 2130903067;
-			
-			// aapt resource value: 0x7f03001c
-			public const int MessageBoxUsage = 2130903068;
-			
-			// aapt resource value: 0x7f03001d
-			public const int MessageGamerJoined = 2130903069;
-			
-			// aapt resource value: 0x7f03001e
-			public const int MessageGamerLeft = 2130903070;
-			
-			// aapt resource value: 0x7f03001f
-			public const int NetworkBusy = 2130903071;
-			
-			// aapt resource value: 0x7f030020
-			public const int NoSessionsFound = 2130903072;
-			
-			// aapt resource value: 0x7f030021
-			public const int Paused = 2130903073;
-			
-			// aapt resource value: 0x7f030022
-			public const int PlayerMatch = 2130903074;
-			
-			// aapt resource value: 0x7f030023
-			public const int QuitGame = 2130903075;
-			
-			// aapt resource value: 0x7f030024
-			public const int ResumeGame = 2130903076;
-			
-			// aapt resource value: 0x7f030025
-			public const int ReturnToLobby = 2130903077;
-			
-			// aapt resource value: 0x7f030026
-			public const int SinglePlayer = 2130903078;
-			
-			// aapt resource value: 0x7f030027
-			public const int SystemLink = 2130903079;
-			
-			private String()
-			{
-			}
-		}
-		
-		public partial class Style
-		{
-			
-			// aapt resource value: 0x7f040000
-			public const int Theme_Splash = 2130968576;
-			
-			private Style()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591

CatapultNetWars/Platforms/Android/Resources/values/Strings.xml

@@ -1,52 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="Back">Back</string>
-	<string name="ConfirmEndSession">Are you sure you want to end this session?</string>
-	<string name="ConfirmExitSample">Are you sure you want to exit this sample?</string>
-	<string name="ConfirmForceStartGame">Are you sure you want to start the game,
-even though not all players are ready?</string>
-<string name="ConfirmLeaveSession">Are you sure you want to leave this session?</string>
-<string name="ConfirmMarketplace">Online gameplay is not available in trial mode.
-Would you like to purchase this game?</string>	
-<string name="ConfirmQuitGame">Are you sure you want to quit this game?	</string>	
-<string name="CreateSession">Create Session</string>
-<string name="EndSession">End Session</string>	
-<string name="ErrorDisconnected">Lost connection to the network session</string>	
-<string name="ErrorGamerPrivilege">You must sign in a suitable gamer profile
-in order to access this functionality</string>	
-<string name="ErrorHostEndedSession">Host ended the session</string>	
-<string name="ErrorNetwork">There was an error while
-accessing the network</string>	
-<string name="ErrorNetworkNotAvailable">Networking is turned
-off or not connected</string>	
-<string name="ErrorRemovedByHost">Host kicked you out of the session</string>		
-<string name="ErrorSessionFull">This session is already full</string>	
-<string name="ErrorSessionNotFound">Session not found. It may have ended,
-or there may be no network connectivity
-between the local machine and session host</string>	
-<string name="ErrorSessionNotJoinable">You must wait for the host to return to
-the lobby before you can join this session</string>	
-<string name="ErrorTrialMode">This functionality is not available in trial mode</string>	
-<string name="ErrorUnknown">An unknown error occurred</string>	
-<string name="Exit">Exit</string>	
-<string name="FindSessions">Find Sessions</string>	
-<string name="HostSuffix"> (host)</string>	
-<string name="JoinSession">Join Session</string>	
-<string name="LeaveSession">Leave Session</string>	
-<string name="Loading">Loading</string>	
-<string name="Lobby">Lobby</string>	
-<string name="MainMenu">Main Menu</string>	
-<string name="MessageBoxUsage">Tap = OK
-Back = Cancel</string>	
-<string name="MessageGamerJoined">{0} joined</string>	
-<string name="MessageGamerLeft">{0} left</string>	
-<string name="NetworkBusy">Networking...</string>	
-<string name="NoSessionsFound">No sessions found</string>	
-<string name="Paused">Paused</string>	
-<string name="PlayerMatch">LIVE</string>	
-<string name="QuitGame">Quit Game</string>	
-<string name="ResumeGame">Resume Game</string>	
-<string name="ReturnToLobby">Return to Lobby</string>	
-<string name="SinglePlayer">Single Player</string>	
-<string name="SystemLink">SystemLink</string>	
+  <string name="app_name">Catapult Wars</string>
 </resources>

CatapultNetWars/Platforms/Android/Resources/values/Styles.xml

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

CatapultNetWars/Platforms/Android/Resources/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">Catapult Wars</string>
+</resources>