ricky/exalted_dice
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Integrated Roll Again and Calc Successes Settings

Browse Source 
into Exalted Dice

Change-Id: I12cfc26e7bdb9abaa7eab54cd567db4520f51410
Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
Ricky Barrette
2012-02-08 10:47:40 -05:00
parent 108d3983d1
commit 93d80bcb33
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ExaltedDice/res/xml/settings.xml
View File

@@ -2,10 +2,12 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true"
android:key="roll_again" android:key="roll_again"
android:summary="@string/roll_again_summary" android:summary="@string/roll_again_summary"
android:title="@string/roll_again" /> android:title="@string/roll_again" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true"
android:key="calc_successes" android:key="calc_successes"
android:title="@string/calc_successes" /> android:title="@string/calc_successes" />

12
ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
View File

@@ -9,6 +9,7 @@ import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle; import android.os.Bundle;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.Log; import android.util.Log;
@@ -45,6 +46,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
private String mGameName; private String mGameName;
private long mGameId; private long mGameId;
private RollHistoryDatabaseAdapter mListAdapter; private RollHistoryDatabaseAdapter mListAdapter;
private SharedPreferences mSettings;
/** /**
* clears the rollHistory List array and refreshes the listview * clears the rollHistory List array and refreshes the listview
@@ -113,6 +115,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
this.setTitle(mGameName); this.setTitle(mGameName);
} }
mSettings = getSharedPreferences(Settings.SETTINGS, Context.MODE_WORLD_WRITEABLE);
mDiceValues = getResources().getStringArray(R.array.dice_types); mDiceValues = getResources().getStringArray(R.array.dice_types);
mListView = (ListView) findViewById(R.id.list); mListView = (ListView) findViewById(R.id.list);
@@ -166,7 +170,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
mNumberPicker.setValue(roll.getAsInteger(Database.KEY_NUMBER)); mNumberPicker.setValue(roll.getAsInteger(Database.KEY_NUMBER));
mDPicker.setValue(parseD(roll.getAsString(Database.KEY_D_TYPE))); mDPicker.setValue(parseD(roll.getAsString(Database.KEY_D_TYPE)));
rollDice(); if(mSettings.getBoolean(Settings.KEY_ROLL_AGAIN, true))
rollDice();
} }
/** /**
@@ -314,7 +319,10 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
} }
resultsString.append(getString(R.string.total)+ total); resultsString.append(getString(R.string.total)+ total);
resultsString.append(getString(R.string.sucesses)+ successes(roll));
if(mSettings.getBoolean(Settings.KEY_CALC_SUCCESSES, true))
resultsString.append(getString(R.string.sucesses)+ successes(roll));
resultsString.append(getString(R.string.rolls)+ rolls.toString()); resultsString.append(getString(R.string.rolls)+ rolls.toString());
return resultsString.toString(); return resultsString.toString();
} }