Added network multiplayer, and fixed numerous bugs.

philliskiragu · Apr 28, 2014 · b66f0ec · b66f0ec
1 parent f378647
commit b66f0ec
Show file tree

Hide file tree

Showing 39 changed files with 6,778 additions and 2,335 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,61 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.jfedor.frozenbubble"
-  android:versionCode="23"
-  android:versionName="1.22" >
-
-  <supports-screens
-    android:smallScreens="true" 
-    android:normalScreens="true" 
-    android:largeScreens="true" 
-    android:anyDensity="true" />
-
-  <uses-sdk
-    android:minSdkVersion="4"
-    android:targetSdkVersion="4" />
-
-  <application
-    android:allowBackup="true"
-    android:debuggable="false"
-    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.SplashScreen"
-      android:configChanges="orientation|keyboardHidden"
-      android:label="@string/title_activity_splash_screen" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-</manifest>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="org.jfedor.frozenbubble"
+  android:versionCode="22"
+  android:versionName="2.0">
+
+  <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:debuggable="false"
+    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>
+</manifest>
diff --git a/res/drawable/round_button.xml b/res/drawable/round_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+  <item android:state_pressed="true" >
+    <shape android:shape="ring" android:innerRadius="0dp" android:thickness="25dp" android:useLevel="false" >
+      <stroke android:width="1dp" android:color="#5e7974" />
+      <gradient android:angle="-90" android:startColor="#345953" android:endColor="#689a92" />            
+    </shape>
+  </item>
+  <item android:state_focused="true" >
+    <shape android:shape="ring" android:innerRadius="0dp" android:thickness="25dp" android:useLevel="false" >
+      <stroke android:width="1dp" android:color="#5e7974" />
+      <solid android:color="#58857e" />       
+    </shape>
+  </item>  
+  <item >
+    <shape android:shape="ring" android:innerRadius="0dp" android:thickness="25dp" android:useLevel="false" >
+      <stroke android:width="1dp" android:color="#5e7974" />
+      <gradient android:angle="-90" android:startColor="#8dbab3" android:endColor="#58857e" />            
+    </shape>
+  </item>
+</selector>
diff --git a/res/layout/activity_preferences_screen.xml b/res/layout/activity_preferences_screen.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:efortin="https://code.google.com/p/frozenbubbleandroid"
+    android:layout_height="fill_parent"
     android:layout_width="fill_parent" >
 
   <PreferenceCategory
@@ -35,32 +36,27 @@
     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"
@@ -74,7 +70,11 @@
 
   <PreferenceCategory
     android:summary="Frozen Bubble Game Options"
-    android:title="Player vs CPU 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" />
   <CheckBoxPreference
     android:defaultValue="true"
     android:key="compressor_option"

diff --git a/res/layout/activity_splash_screen.xml b/res/layout/activity_splash_screen.xml
@@ -3,10 +3,10 @@
   android:layout_width="fill_parent"
   android:layout_height="fill_parent"
   android:background="@color/black"
-  tools:context=".SplashScreen" >
+  tools:context=".HomeScreen" >
 
   <ImageView
-    android:contentDescription="@string/title_activity_splash_screen"
+    android:contentDescription="@string/title_activity_home_screen"
     android:src="@drawable/splash"
     android:id="@+id/splash"
     android:layout_width="fill_parent"

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
@@ -20,7 +20,7 @@
   <string name="play_level_music">Musik Abspielen</string>
   <string name="play_sound_effects">Spielen Soundeffekte</string>
   <string name="title_activity_frozen_bubble">Frozen Bubble</string>
-  <string name="title_activity_splash_screen">Frozen Bubble</string>
+  <string name="title_activity_home_screen">Frozen Bubble</string>
   <string name="scrolling_credits">"Original Development\n"
     "------------------------\n"
     "\nGuillaume Cottenceau - Design and Programming\n"

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
@@ -20,7 +20,7 @@
   <string name="play_level_music">Tocar Música</string>
   <string name="play_sound_effects">Tocar Efectos Sonoros</string>
   <string name="title_activity_frozen_bubble">Frozen Bubble</string>
-  <string name="title_activity_splash_screen">Frozen Bubble</string>
+  <string name="title_activity_home_screen">Frozen Bubble</string>
   <string name="scrolling_credits">"Original Development\n"
     "------------------------\n"
     "\nGuillaume Cottenceau - Design and Programming\n"

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
@@ -20,7 +20,7 @@
   <string name="play_level_music">Jouer Musique</string>
   <string name="play_sound_effects">Jouer Effets Sonores</string>
   <string name="title_activity_frozen_bubble">Frozen Bubble</string>
-  <string name="title_activity_splash_screen">Frozen Bubble</string>
+  <string name="title_activity_home_screen">Frozen Bubble</string>
   <string name="scrolling_credits">"Développement Original\n"
     "------------------------\n"
     "\nGuillaume Cottenceau - Design et Programmation\n"

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
   <string name="play_level_music">奏乐</string>
   <string name="play_sound_effects">播放声音效果</string>
   <string name="title_activity_frozen_bubble">冰冻泡泡</string>
-  <string name="title_activity_splash_screen">冰冻泡泡</string>
+  <string name="title_activity_home_screen">冰冻泡泡</string>
   <string name="scrolling_credits">"Original Development\n"
     "------------------------\n"
     "\nGuillaume Cottenceau - Design and Programming\n"

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -20,7 +20,7 @@
   <string name="play_level_music">Play Level Music</string>
   <string name="play_sound_effects">Play Sound Effects</string>
   <string name="title_activity_frozen_bubble">Frozen Bubble</string>
-  <string name="title_activity_splash_screen">Frozen Bubble</string>
+  <string name="title_activity_home_screen">Frozen Bubble</string>
   <string name="scrolling_credits">"Original Development\n"
     "------------------------\n"
     "\nGuillaume Cottenceau - Design and Programming\n"

diff --git a/src/com/efortin/frozenbubble/AccelerometerManager.java b/src/com/efortin/frozenbubble/AccelerometerManager.java
@@ -67,6 +67,7 @@
  * <br>  http://www.gnu.org/licenses/gpl-3.0.html
  *
  * @author Antoine Vianey
+ *
  */
 public class AccelerometerManager {
   private static Sensor sensor;