Added bluetooth network multiplayer.

Simplified local WiFi network multiplayer. No IP addresses needed. Fixed screen orientation display issues on some devices.
philliskiragu · Jul 20, 2015 · 1265bc4 · 1265bc4
1 parent 815cc99
commit 1265bc4
Show file tree

Hide file tree

Showing 18 changed files with 1,932 additions and 1,205 deletions.
diff --git a/.cproject b/.cproject
@@ -55,4 +55,5 @@
 		<resource resourceType="PROJECT" workspacePath="/frozenbubble"/>
 	</storageModule>
 	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
 </cproject>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,65 +1,62 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.jfedor.frozenbubble"
-  android:versionCode="37"
-  android:versionName="3.4">
-
-  <supports-screens
-    android:smallScreens="true"
-    android:normalScreens="true"
-    android:largeScreens="true"
-    android:anyDensity="true"/>
-
-  <uses-sdk
-    android:minSdkVersion="4"
-    android:targetSdkVersion="4"/>
-
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
-  <uses-permission android:name="android.permission.INTERNET"/>
-
-  <application
-    android:allowBackup="true"
-    android:icon="@drawable/app_frozen_bubble"
-    android:label="@string/app_name">
-
-    <activity
-      android:name="FrozenBubble"
-      android:configChanges="orientation|keyboardHidden"
-      android:label="@string/app_name"
-      android:alwaysRetainTaskState="true"
-      android:launchMode="singleInstance">
-      <intent-filter>
-        <action android:name="org.jfedor.frozenbubble.GAME"/>
-        <category android:name="android.intent.category.DEFAULT"/>
-      </intent-filter>
-    </activity>
-
-    <activity
-      android:name="org.jfedor.frozenbubble.InterstitialActivity"
-      android:label="Interstitial">
-    </activity>
-
-    <activity
-      android:name="com.efortin.frozenbubble.PreferencesActivity"
-      android:theme="@android:style/Theme.Black.NoTitleBar">
-    </activity>
-
-    <activity
-      android:name="com.efortin.frozenbubble.ScrollingCredits"
-      android:configChanges="orientation|keyboardHidden"
-      android:label="@string/menu_about">
-    </activity>
-
-    <activity
-      android:name="com.efortin.frozenbubble.HomeScreen"
-      android:configChanges="orientation|keyboardHidden"
-      android:label="@string/title_activity_home_screen">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-    </activity>
-  </application>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="org.jfedor.frozenbubble"
+  android:versionCode="38"
+  android:versionName="3.5">
+
+  <supports-screens
+    android:smallScreens="true"
+    android:normalScreens="true"
+    android:largeScreens="true"
+    android:anyDensity="true"/>
+
+  <uses-sdk
+    android:minSdkVersion="10"
+    android:targetSdkVersion="10"/>
+
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+  <uses-permission android:name="android.permission.BLUETOOTH"/>
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+  <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+
+  <application
+    android:allowBackup="true"
+    android:icon="@drawable/app_frozen_bubble"
+    android:label="@string/app_name">
+
+    <activity
+      android:name="FrozenBubble"
+      android:configChanges="orientation|keyboardHidden"
+      android:label="@string/app_name"
+      android:alwaysRetainTaskState="true"
+      android:launchMode="singleInstance">
+      <intent-filter>
+        <action android:name="org.jfedor.frozenbubble.GAME"/>
+        <category android:name="android.intent.category.DEFAULT"/>
+      </intent-filter>
+    </activity>
+
+    <activity
+      android:name="com.efortin.frozenbubble.PreferencesActivity"
+      android:theme="@android:style/Theme.Black.NoTitleBar">
+    </activity>
+
+    <activity
+      android:name="com.efortin.frozenbubble.ScrollingCredits"
+      android:configChanges="orientation|keyboardHidden"
+      android:label="@string/menu_about">
+    </activity>
+
+    <activity
+      android:name="com.efortin.frozenbubble.HomeScreen"
+      android:configChanges="orientation|keyboardHidden"
+      android:label="@string/title_activity_home_screen">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+  </application>
 </manifest>
diff --git a/project.properties b/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-4
+target=android-10
diff --git a/res/layout/activity_preferences_screen.xml b/res/layout/activity_preferences_screen.xml
@@ -31,32 +31,31 @@
   <PreferenceCategory
     android:summary="Frozen Bubble Game Options"
     android:title="@string/menu_settings" >
-  <CheckBoxPreference
-    android:defaultValue="true"
-    android:key="ads_option"
-    android:summary="On/Off"
-    android:title="Enable Ads" />
   <CheckBoxPreference
     android:defaultValue="true"
     android:key="colorblind_option"
     android:summary="On/Off"
     android:title="Colorblind Mode" />
+
   <CheckBoxPreference
     android:defaultValue="true"
     android:key="fullscreen_option"
     android:summary="On/Off"
     android:title="Fullscreen Mode" />
+
   <CheckBoxPreference
     android:defaultValue="true"
     android:key="rush_me_option"
     android:summary="On/Off"
     android:title="Hurry Mode" />
+
   <ListPreference
     android:entries="@array/shoot_mode_array"
     android:entryValues="@array/targeting_values_array"
     android:key="targeting_option"
     android:summary="Choose targeting mode"
     android:title="@string/menu_target_mode" />
+
   <com.efortin.frozenbubble.SeekBarPreference
     android:defaultValue="20"
     android:key="collision_option"
@@ -71,10 +70,11 @@
   <PreferenceCategory
     android:summary="Frozen Bubble Game Options"
     android:title="2 Player Game Options" >
-  <EditTextPreference
-    android:key="opponent_ip_address"
-    android:summary="Please enter opponent IP address"
-    android:title="Opponent Internet Address" />
+  <ListPreference
+    android:defaultValue="0"
+    android:key="bluetooth_list"
+    android:summary="Select Bluetooth Device"
+    android:title="@string/menu_bluetooth_device" />
   <CheckBoxPreference
     android:defaultValue="true"
     android:key="compressor_option"

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Frozen Bubble</string>
+  <string name="exit">Exit</string>
   <string name="install_editor">Weiterleitung zum Android Market für den Download des Level-Editors…</string>
   <string name="market_missing">Android Market nicht gefunden! Bitten installieren Sie den Level-Editor manuell.</string>
+  <string name="menu_bluetooth_device">Bluetooth Device</string>
   <string name="menu_new_game">Starten neues Spiel</string>
   <string name="menu_colorblind_on">Darstellung mit Symbolen</string>
   <string name="menu_colorblind_off">Darstellung ohne Symbole</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Frozen Bubble</string>
+  <string name="exit">Exit</string>
   <string name="install_editor">Redireccionando a Google Play para descargar el editor de niveles...</string>
   <string name="market_missing">No se puede encontrar la aplicación de Google Play. Por favor, instala el editor de niveles manualmente.</string>
+  <string name="menu_bluetooth_device">Bluetooth Device</string>
   <string name="menu_new_game">Nuevo juego</string>
   <string name="menu_colorblind_on">Activar modo daltónico</string>
   <string name="menu_colorblind_off">Desactivar modo daltónico</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Frozen Bubble</string>
+  <string name="exit">Exit</string>
   <string name="install_editor">Redirection vers le Play Store afin de télécharger l\'éditeur de niveau…</string>
   <string name="market_missing">Play Store introuvable! Veuillez installer l\'éditeur de niveau Frozen Bubble manuellement.</string>
+  <string name="menu_bluetooth_device">Bluetooth Device</string>
   <string name="menu_new_game">Nouvelle Partie</string>
   <string name="menu_colorblind_on">Activer Mode Daltonien</string>
   <string name="menu_colorblind_off">Désactiver Mode Daltonien</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">冰冻泡泡</string>
+  <string name="exit">Exit</string>
   <string name="install_editor">推荐您直接到市场上下载关卡编辑器…</string>
   <string name="market_missing">找不到Android市场! 请手动安装冰冻泡泡编辑器.</string>
+  <string name="menu_bluetooth_device">Bluetooth Device</string>
   <string name="menu_new_game">开始新游戏</string>
   <string name="menu_colorblind_on">色盲模式开启</string>
   <string name="menu_colorblind_off">色盲模式关闭</string>

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Frozen Bubble</string>
+  <string name="exit">Exit</string>
   <string name="install_editor">Redirecting you to the Market to download the Frozen Bubble Level Editor…</string>
   <string name="market_missing">Cannot find Android Market! Please install Frozen Bubble Level Editor manually.</string>
+  <string name="menu_bluetooth_device">Bluetooth Device</string>
   <string name="menu_new_game">Start New Game</string>
   <string name="menu_colorblind_on">Colorblind Mode On</string>
   <string name="menu_colorblind_off">Colorblind Mode Off</string>