Added shake setting

ExposureSoftware · Oct 27, 2013 · 050a655 · 050a655
1 parent 4feb0b1
commit 050a655
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 2 deletions.
diff --git a/bin/XsAndOs.apk b/bin/XsAndOs.apk
diff --git a/bin/classes.dex b/bin/classes.dex
diff --git a/bin/classes/com/exposuresoftware/xsandos/BuildConfig.class b/bin/classes/com/exposuresoftware/xsandos/BuildConfig.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/ESCoordButton.class b/bin/classes/com/exposuresoftware/xsandos/ESCoordButton.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game$1.class b/bin/classes/com/exposuresoftware/xsandos/Game$1.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game$2.class b/bin/classes/com/exposuresoftware/xsandos/Game$2.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game.class b/bin/classes/com/exposuresoftware/xsandos/Game.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game2$1.class b/bin/classes/com/exposuresoftware/xsandos/Game2$1.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game2$2.class b/bin/classes/com/exposuresoftware/xsandos/Game2$2.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game2$Marks.class b/bin/classes/com/exposuresoftware/xsandos/Game2$Marks.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Game2.class b/bin/classes/com/exposuresoftware/xsandos/Game2.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/GameBoard$Mark.class b/bin/classes/com/exposuresoftware/xsandos/GameBoard$Mark.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/GameBoard$State.class b/bin/classes/com/exposuresoftware/xsandos/GameBoard$State.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/GameBoard.class b/bin/classes/com/exposuresoftware/xsandos/GameBoard.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/MainMenu.class b/bin/classes/com/exposuresoftware/xsandos/MainMenu.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$attr.class b/bin/classes/com/exposuresoftware/xsandos/R$attr.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$drawable.class b/bin/classes/com/exposuresoftware/xsandos/R$drawable.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$id.class b/bin/classes/com/exposuresoftware/xsandos/R$id.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$layout.class b/bin/classes/com/exposuresoftware/xsandos/R$layout.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$menu.class b/bin/classes/com/exposuresoftware/xsandos/R$menu.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$string.class b/bin/classes/com/exposuresoftware/xsandos/R$string.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$style.class b/bin/classes/com/exposuresoftware/xsandos/R$style.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R$styleable.class b/bin/classes/com/exposuresoftware/xsandos/R$styleable.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/R.class b/bin/classes/com/exposuresoftware/xsandos/R.class
diff --git a/bin/classes/com/exposuresoftware/xsandos/Space.class b/bin/classes/com/exposuresoftware/xsandos/Space.class
diff --git a/bin/resources.ap_ b/bin/resources.ap_
diff --git a/gen/com/exposuresoftware/xsandos/R.java b/gen/com/exposuresoftware/xsandos/R.java
@@ -96,6 +96,8 @@ public static final class string {
         public static final int pref_key_gameplay_settings=0x7f05000f;
         public static final int pref_random_start=0x7f05000d;
         public static final int pref_random_start_summ=0x7f05000e;
+        public static final int pref_shake_summ=0x7f050016;
+        public static final int pref_shake_to_clear=0x7f050015;
         public static final int return_to_title=0x7f05000c;
     }
     public static final class style {

diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -20,6 +20,8 @@
     <string name="dialog_shake_header">Clear the Board?</string>
     <string name="cancel">Cancel</string>
     <string name="new_game">Reset</string>
-    <string name="clear_board">Clear the board?</string>
+    <string name="clear_board">Clear the board?</string>
+    <string name="pref_shake_to_clear">Shake to Clear</string>
+    <string name="pref_shake_summ">If selected, will activate the shake gesture to clear the board.</string>
 
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
@@ -8,6 +8,11 @@
 	        android:title="@string/pref_random_start"
 	        android:summary="@string/pref_random_start_summ"
 	        android:defaultValue="true" />
+	    <CheckBoxPreference
+	        android:key="pref_key_shake_to_clear"
+	        android:title="@string/pref_shake_to_clear"
+	        android:summary="@string/pref_shake_summ"
+	        android:defaultValue="true" />
 	</PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/exposuresoftware/xsandos/Game.java b/src/com/exposuresoftware/xsandos/Game.java
@@ -61,7 +61,8 @@ public void onCreate(Bundle icicle) {
 	    sensorListener.setOnShakeListener(new ShakeEventListener.OnShakeListener() {
 
 	      public void onShake() {
-	    	  if ( !dialog_up ) {
+	    	  if ( !dialog_up && PreferenceManager.getDefaultSharedPreferences( Game.this )
+	  				.getBoolean( "pref_key_shake_to_clear", true ) ) {
 		    	  	Typeface chalkduster = Typeface.createFromAsset(getAssets(), 
 			        		"fonts/Chalkduster.ttf");
 					final Dialog dialog = new Dialog(Game.this, R.style.CleanDialog);