From e0cfaa2266fcc0fddb901f06c31c903535e17e4d Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Tue, 7 Feb 2012 11:38:59 -0500
Subject: [PATCH] Added settings for roll again and calc successes

These changes are finished on the settings activity side, need to be
implemented on the application side

Change-Id: I8a2d3a027d21f3a62a0cb84eaa0b60d9bcc73ede
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 ExaltedDice/res/values/strings.xml                    |  4 ++++
 ExaltedDice/res/xml/settings.xml                      |  8 ++++++++
 .../com/TwentyCode/android/ExaltedDice/Settings.java  | 11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/ExaltedDice/res/values/strings.xml b/ExaltedDice/res/values/strings.xml
index a95a8e4..6e72d5e 100755
--- a/ExaltedDice/res/values/strings.xml
+++ b/ExaltedDice/res/values/strings.xml
@@ -22,5 +22,9 @@
     <string name="total">Total: </string>
     <string name="sucesses">\nSuccesses: </string>
     <string name="rolls">\nRolls: </string>
+    <string name="roll_again">Roll Again</string>
+    <string name="roll_again_summary">Rolls the with the same presets as the selected roll from history</string>
+    <string name="calc_successes">Calculate Successes</string>
+    <string name="calc_successes_summary">Calculates the total amount of success for each roll</string>
 
 </resources>
\ No newline at end of file
diff --git a/ExaltedDice/res/xml/settings.xml b/ExaltedDice/res/xml/settings.xml
index f8a6ac8..aeb5e6a 100644
--- a/ExaltedDice/res/xml/settings.xml
+++ b/ExaltedDice/res/xml/settings.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <CheckBoxPreference
+        android:key="roll_again"
+        android:summary="@string/roll_again_summary"
+        android:title="@string/roll_again" />
+    <CheckBoxPreference
+        android:key="calc_successes"
+        android:title="@string/calc_successes" />
+
     <PreferenceCategory android:title="@string/contact_us" >
         <Preference
             android:key="email"
diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
index 07b89be..98a5cbb 100644
--- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
+++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
@@ -29,6 +29,17 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
 	
 	public static final String SETTINGS = "settings";
 	private static final CharSequence EMAIL = "email";
+	
+	public static final String KEY_ROLL_AGAIN = "roll_again";
+	public static final String KEY_CALC_SUCCESSES = "calc_successes";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+//	public static final String KEY_ = "";
+	
 
 	/**
 	 * generates the exception repost email intent