Updated UI to allow the user to select different dice, removed old
unneeded code Change-Id: Iecfc11ed9663ec302d362fa8da4a3cd81d8e7d82
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
@@ -10,3 +10,4 @@
|
|||||||
# Indicates whether an apk should be generated for each density.
|
# Indicates whether an apk should be generated for each density.
|
||||||
# Project target.
|
# Project target.
|
||||||
target=android-15
|
target=android-15
|
||||||
|
android.library.reference.1=../../exception_handler_library/ExceptionHandlerLib
|
||||||
|
|||||||
30
ExaltedDice/res/layout/dice_selector.xml
Normal file
30
ExaltedDice/res/layout/dice_selector.xml
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content" >
|
||||||
|
|
||||||
|
<NumberPicker
|
||||||
|
android:id="@+id/d_Picker"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_marginLeft="10dip" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView2"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerVertical="true"
|
||||||
|
android:layout_marginLeft="10dip"
|
||||||
|
android:layout_toRightOf="@id/d_Picker"
|
||||||
|
android:text="Number"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceLarge" />
|
||||||
|
|
||||||
|
<NumberPicker
|
||||||
|
android:id="@+id/number_Picker"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_toRightOf="@+id/textView2" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@@ -1,60 +1,41 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:myapp="com.TwentyCode.android.ExaltedDice"
|
xmlns:myapp="com.TwentyCode.android.ExaltedDice"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="vertical">
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<LinearLayout android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:orientation="horizontal">
|
|
||||||
|
|
||||||
<com.TwentyCode.android.ExaltedDice.NumberPickerButton android:id="@+id/down"
|
<include
|
||||||
android:layout_width="60px"
|
android:id="@+id/die_selector"
|
||||||
android:layout_height="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:text="-"
|
android:layout_height="wrap_content"
|
||||||
/>
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
<EditText
|
layout="@layout/dice_selector" />
|
||||||
android:id="@+id/dice"
|
|
||||||
android:layout_width="100px"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="1"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:gravity="left"
|
|
||||||
android:phoneNumber="true"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<com.TwentyCode.android.ExaltedDice.NumberPickerButton
|
|
||||||
android:id="@+id/up"
|
|
||||||
android:layout_width="60px"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="+"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/roll"
|
|
||||||
android:layout_width="100px"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="Roll"
|
|
||||||
/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<ListView android:id="@+id/list"
|
<Button
|
||||||
android:layout_gravity="top"
|
android:id="@+id/roll_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"/>
|
android:layout_below="@id/die_selector"
|
||||||
|
android:text="Roll!" />
|
||||||
<com.admob.android.ads.AdView
|
|
||||||
android:id="@+id/ad"
|
<ListView
|
||||||
android:layout_gravity="bottom"
|
android:id="@+id/list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
myapp:backgroundColor="#000000"
|
android:layout_above="@+id/ad"
|
||||||
myapp:primaryTextColor="#FFFFFF"
|
android:layout_below="@id/roll_button"
|
||||||
myapp:secondaryTextColor="#CCCCCC"/>
|
android:layout_gravity="top" />
|
||||||
|
|
||||||
</LinearLayout>
|
<com.admob.android.ads.AdView
|
||||||
|
android:id="@id/ad"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_gravity="bottom"
|
||||||
|
myapp:backgroundColor="#000000"
|
||||||
|
myapp:primaryTextColor="#FFFFFF"
|
||||||
|
myapp:secondaryTextColor="#CCCCCC" />
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
@@ -3,159 +3,41 @@ package com.TwentyCode.android.ExaltedDice;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.TwentyCodes.android.exception.ExceptionHandler;
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Handler;
|
|
||||||
import android.os.Vibrator;
|
import android.os.Vibrator;
|
||||||
import android.text.InputFilter;
|
|
||||||
import android.text.InputType;
|
|
||||||
import android.text.Spanned;
|
|
||||||
import android.text.method.NumberKeyListener;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.MenuItem;
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
import android.view.View.OnLongClickListener;
|
|
||||||
import android.view.inputmethod.InputMethodManager;
|
|
||||||
import android.widget.AdapterView;
|
import android.widget.AdapterView;
|
||||||
import android.widget.AdapterView.OnItemClickListener;
|
import android.widget.AdapterView.OnItemClickListener;
|
||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Button;
|
|
||||||
import android.widget.EditText;
|
|
||||||
import android.widget.ListView;
|
import android.widget.ListView;
|
||||||
|
import android.widget.NumberPicker;
|
||||||
|
import android.widget.NumberPicker.OnValueChangeListener;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
public class ExaltedDice extends Activity implements OnClickListener, OnLongClickListener, OnItemClickListener {
|
import com.TwentyCodes.android.exception.ExceptionHandler;
|
||||||
|
|
||||||
|
public class ExaltedDice extends Activity implements OnClickListener, OnItemClickListener, OnValueChangeListener {
|
||||||
|
|
||||||
private EditText dice;
|
|
||||||
private ListView listview;
|
private ListView listview;
|
||||||
private ArrayList<String> rollHistory = new ArrayList<String>();
|
private ArrayList<String> rollHistory = new ArrayList<String>();
|
||||||
private ArrayList<Integer> rolled = new ArrayList<Integer>();
|
private ArrayList<Integer> rolled = new ArrayList<Integer>();
|
||||||
private int intSuccesses;
|
private int intSuccesses;
|
||||||
private int mCurrent;
|
private int mRolls = 1;
|
||||||
private static boolean mIncrement;
|
private int mD = 2;
|
||||||
private static boolean mDecrement;
|
private NumberPicker mNumberPicker;
|
||||||
private InputFilter mNumberInputFilter;
|
private int mCurrentDie;
|
||||||
private String[] mDisplayedValues;
|
|
||||||
//the speed in milliseconds for dice increment or decrement
|
|
||||||
private long mSpeed = 300;
|
|
||||||
//the least and most dice allowed
|
|
||||||
private int mStart = 1;
|
|
||||||
private int mEnd = 999;
|
|
||||||
private static final int MENU_QUIT = Menu.FIRST;
|
private static final int MENU_QUIT = Menu.FIRST;
|
||||||
private static final int MENU_CLEAR = Menu.FIRST + 1;
|
private static final int MENU_CLEAR = Menu.FIRST + 1;
|
||||||
private static final String TAG = "ExaltedDice";
|
private static final String TAG = "ExaltedDice";
|
||||||
private Handler mHandler;
|
private static final String[] DICE_VALUES = { "D2", "D3", "D4", "D6", "D8", "D10", "D12", "D20", "D100" };
|
||||||
//this runnable will be used to increment or decrement the amount of dice being rolled
|
|
||||||
private final Runnable mRunnable = new Runnable() {
|
|
||||||
public void run() {
|
|
||||||
if (mIncrement) {
|
|
||||||
changeCurrent(mCurrent + 1);
|
|
||||||
mHandler.postDelayed(this, mSpeed);
|
|
||||||
} else if (mDecrement) {
|
|
||||||
changeCurrent(mCurrent - 1);
|
|
||||||
mHandler.postDelayed(this, mSpeed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private static final char[] DIGIT_CHARACTERS = new char[] {
|
|
||||||
'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'
|
|
||||||
};
|
|
||||||
|
|
||||||
private class NumberPickerInputFilter implements InputFilter {
|
|
||||||
public CharSequence filter(CharSequence source, int start, int end,
|
|
||||||
Spanned dest, int dstart, int dend) {
|
|
||||||
if (mDisplayedValues == null) {
|
|
||||||
return mNumberInputFilter.filter(source, start, end, dest, dstart, dend);
|
|
||||||
}
|
|
||||||
CharSequence filtered = String.valueOf(source.subSequence(start, end));
|
|
||||||
String result = String.valueOf(dest.subSequence(0, dstart)) + filtered
|
|
||||||
+ dest.subSequence(dend, dest.length());
|
|
||||||
String str = String.valueOf(result).toLowerCase();
|
|
||||||
for (String val : mDisplayedValues) {
|
|
||||||
val = val.toLowerCase();
|
|
||||||
if (val.startsWith(str)) {
|
|
||||||
return filtered;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class NumberRangeKeyListener extends NumberKeyListener {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) {
|
|
||||||
|
|
||||||
CharSequence filtered = super.filter(source, start, end, dest, dstart, dend);
|
|
||||||
if (filtered == null) {
|
|
||||||
filtered = source.subSequence(start, end);
|
|
||||||
}
|
|
||||||
|
|
||||||
String result = String.valueOf(dest.subSequence(0, dstart)) + filtered + dest.subSequence(dend, dest.length());
|
|
||||||
|
|
||||||
if ("".equals(result)) {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
int val = getSelectedPos(result);
|
|
||||||
|
|
||||||
/* Ensure the user can't type in a value greater
|
|
||||||
* than the max allowed. We have to allow less than min
|
|
||||||
* as the user might want to delete some numbers
|
|
||||||
* and then type a new number.
|
|
||||||
*/
|
|
||||||
if (val > mEnd) {
|
|
||||||
return "";
|
|
||||||
} else {
|
|
||||||
return filtered;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected char[] getAcceptedChars() {
|
|
||||||
return DIGIT_CHARACTERS;
|
|
||||||
}
|
|
||||||
|
|
||||||
// XXX This doesn't allow for range limits when controlled by a
|
|
||||||
// soft input method!
|
|
||||||
public int getInputType() {
|
|
||||||
return InputType.TYPE_CLASS_NUMBER;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* stops decrementing of dice after longpress
|
|
||||||
* @author ricky barrette
|
|
||||||
*/
|
|
||||||
public static void cancelDecrement() {
|
|
||||||
mDecrement = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* stop incrementing of dice after longpress
|
|
||||||
* @author ricky barrette
|
|
||||||
*/
|
|
||||||
public static void cancelIncrement() {
|
|
||||||
mIncrement = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void changeCurrent(int current) {
|
|
||||||
// Wrap around the values if we go past the start or end
|
|
||||||
if (current > mEnd) {
|
|
||||||
current = mStart;
|
|
||||||
} else if (current < mStart) {
|
|
||||||
current = mEnd;
|
|
||||||
}
|
|
||||||
mCurrent = current;
|
|
||||||
updateView();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* clears the rollHistory List array and refreshes the listview
|
* clears the rollHistory List array and refreshes the listview
|
||||||
@@ -168,32 +50,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getSelectedPos(String str) {
|
|
||||||
if (mDisplayedValues == null) {
|
|
||||||
return Integer.parseInt(str);
|
|
||||||
} else {
|
|
||||||
for (int i = 0; i < mDisplayedValues.length; i++) {
|
|
||||||
|
|
||||||
/* Don't force the user to type in jan when ja will do */
|
|
||||||
str = str.toLowerCase();
|
|
||||||
if (mDisplayedValues[i].toLowerCase().startsWith(str)) {
|
|
||||||
return mStart + i;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* The user might have typed in a number into the month field i.e.
|
|
||||||
* 10 instead of OCT so support that too.
|
|
||||||
*/
|
|
||||||
try {
|
|
||||||
return Integer.parseInt(str);
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
|
|
||||||
/* Ignore as if it's not a number we don't care */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return mStart;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* also implemented OnClickListener
|
* also implemented OnClickListener
|
||||||
*
|
*
|
||||||
@@ -202,25 +58,12 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void onClick(View v){
|
public void onClick(View v){
|
||||||
|
switch(v.getId()){
|
||||||
//get the number from the edit text
|
case R.id.roll_button:
|
||||||
try {
|
|
||||||
mCurrent = Integer.parseInt(dice.getText().toString());
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (v.getId()){
|
|
||||||
case R.id.up:
|
|
||||||
changeCurrent(mCurrent + 1);
|
|
||||||
break;
|
|
||||||
case R.id.down:
|
|
||||||
changeCurrent(mCurrent - 1);
|
|
||||||
break;
|
|
||||||
case R.id.roll:
|
|
||||||
rollDice();
|
rollDice();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -236,42 +79,22 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
Log.i(TAG, "onCreate()");
|
Log.i(TAG, "onCreate()");
|
||||||
setContentView(R.layout.main);
|
setContentView(R.layout.main);
|
||||||
|
|
||||||
mHandler = new Handler();
|
|
||||||
|
|
||||||
/*
|
|
||||||
* views and listeners
|
|
||||||
*/
|
|
||||||
dice = (EditText) findViewById(R.id.dice);
|
|
||||||
InputFilter inputFilter = new NumberPickerInputFilter();
|
|
||||||
mNumberInputFilter = new NumberRangeKeyListener();
|
|
||||||
dice.setFilters(new InputFilter[] {inputFilter});
|
|
||||||
|
|
||||||
listview = (ListView) findViewById(R.id.list);
|
listview = (ListView) findViewById(R.id.list);
|
||||||
NumberPickerButton btAddDice = (NumberPickerButton) findViewById(R.id.up);
|
|
||||||
NumberPickerButton btSubtractDice = (NumberPickerButton) findViewById(R.id.down);
|
|
||||||
Button btRollDice = (Button) findViewById(R.id.roll);
|
|
||||||
btAddDice.setOnClickListener(this);
|
|
||||||
btSubtractDice.setOnClickListener(this);
|
|
||||||
btRollDice.setOnClickListener(this);
|
|
||||||
listview.setOnItemClickListener(this);
|
listview.setOnItemClickListener(this);
|
||||||
btAddDice.setOnLongClickListener(this);
|
|
||||||
btSubtractDice.setOnLongClickListener(this);
|
|
||||||
|
|
||||||
/*
|
NumberPicker mDPicker = (NumberPicker) findViewById(R.id.d_Picker);
|
||||||
* shake Listener
|
mDPicker.setMinValue(0);
|
||||||
*/
|
mDPicker.setMaxValue(DICE_VALUES.length -1);
|
||||||
// ShakeListener mShaker = new ShakeListener(this);
|
mDPicker.setDisplayedValues(DICE_VALUES);
|
||||||
// mShaker.setOnShakeListener(new ShakeListener.OnShakeListener() {
|
mDPicker.setOnValueChangedListener(this);
|
||||||
// public void onShake() {
|
|
||||||
// rollDice();
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
|
|
||||||
/*
|
mNumberPicker = (NumberPicker) findViewById(R.id.number_Picker);
|
||||||
* hide keyboard
|
mNumberPicker.setMaxValue(999);
|
||||||
*/
|
mNumberPicker.setMinValue(1);
|
||||||
((InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow(dice.getWindowToken(), 0);
|
mNumberPicker.setOnValueChangedListener(this);
|
||||||
|
|
||||||
|
findViewById(R.id.roll_button).setOnClickListener(this);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* display hello message
|
* display hello message
|
||||||
*/
|
*/
|
||||||
@@ -299,40 +122,11 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
@Override
|
@Override
|
||||||
public void onItemClick(AdapterView<?> arg0, View v, int position, long arg3) {
|
public void onItemClick(AdapterView<?> arg0, View v, int position, long arg3) {
|
||||||
if(rolled.size() != 0){
|
if(rolled.size() != 0){
|
||||||
dice.setText("" + rolled.get(position));
|
mNumberPicker.setValue(rolled.get(position));
|
||||||
rollDice();
|
rollDice();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* starts a runnable that will increment or decrement the dice
|
|
||||||
*
|
|
||||||
* @author ricky barrette 3-27-2010
|
|
||||||
* @param v
|
|
||||||
*/
|
|
||||||
public boolean onLongClick(View v) {
|
|
||||||
|
|
||||||
//get the number from the edit text
|
|
||||||
try {
|
|
||||||
mCurrent = Integer.parseInt(dice.getText().toString());
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (v.getId()){
|
|
||||||
case R.id.up:
|
|
||||||
mIncrement = true;
|
|
||||||
mHandler.post(mRunnable);
|
|
||||||
return true;
|
|
||||||
|
|
||||||
case R.id.down:
|
|
||||||
mDecrement = true;
|
|
||||||
mHandler.post(mRunnable);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* handles menu selection
|
* handles menu selection
|
||||||
*
|
*
|
||||||
@@ -350,7 +144,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -363,7 +156,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
// Restore UI state from the savedInstanceState.
|
// Restore UI state from the savedInstanceState.
|
||||||
// This bundle has also been passed to onCreate.
|
// This bundle has also been passed to onCreate.
|
||||||
rollHistory = savedInstanceState.getStringArrayList("roll_history");
|
rollHistory = savedInstanceState.getStringArrayList("roll_history");
|
||||||
dice.setText(savedInstanceState.getString("dice"));
|
|
||||||
rolled = savedInstanceState.getIntegerArrayList("rolled");
|
rolled = savedInstanceState.getIntegerArrayList("rolled");
|
||||||
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
||||||
}
|
}
|
||||||
@@ -378,7 +170,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
// This bundle will be passed to onCreate if the process is
|
// This bundle will be passed to onCreate if the process is
|
||||||
// killed and restarted.
|
// killed and restarted.
|
||||||
savedInstanceState.putStringArrayList("roll_history", rollHistory);
|
savedInstanceState.putStringArrayList("roll_history", rollHistory);
|
||||||
savedInstanceState.putString("dice", dice.getText().toString());
|
|
||||||
savedInstanceState.putIntegerArrayList("rolled", rolled);
|
savedInstanceState.putIntegerArrayList("rolled", rolled);
|
||||||
super.onSaveInstanceState(savedInstanceState);
|
super.onSaveInstanceState(savedInstanceState);
|
||||||
}
|
}
|
||||||
@@ -417,7 +208,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
public String results(int times) {
|
public String results(int times) {
|
||||||
Log.i(TAG, "results()");
|
Log.i(TAG, "results()");
|
||||||
StringBuffer resultsString = new StringBuffer();
|
StringBuffer resultsString = new StringBuffer();
|
||||||
resultsString.append("Rolled "+ times +" dice\n");
|
resultsString.append("Rolled "+ times +" "+DICE_VALUES[mCurrentDie]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* roll the dice
|
* roll the dice
|
||||||
@@ -427,7 +218,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
/**
|
/**
|
||||||
* add number of successes to resultsString
|
* add number of successes to resultsString
|
||||||
*/
|
*/
|
||||||
resultsString.append("Successes: "+ successes(roll) +"\n");
|
resultsString.append("\nSuccesses: "+ successes(roll) +"\n");
|
||||||
|
|
||||||
resultsString.append("Rolled: ");
|
resultsString.append("Rolled: ");
|
||||||
/**
|
/**
|
||||||
@@ -449,14 +240,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
// vibrate for 50 milliseconds
|
// vibrate for 50 milliseconds
|
||||||
vibrate(50);
|
vibrate(50);
|
||||||
|
|
||||||
//get the number from the edit text
|
rolled.add(0, mRolls);
|
||||||
try {
|
rollHistory.add(0, results(mRolls));
|
||||||
mCurrent = Integer.parseInt(dice.getText().toString());
|
|
||||||
} catch (NumberFormatException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
rolled.add(0, mCurrent);
|
|
||||||
rollHistory.add(0, results(mCurrent));
|
|
||||||
|
|
||||||
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
listview.setAdapter(new ArrayAdapter<String>(this, R.layout.list_row, rollHistory));
|
||||||
}
|
}
|
||||||
@@ -473,7 +258,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
int[] roll = new int[times];
|
int[] roll = new int[times];
|
||||||
Random random = new Random();
|
Random random = new Random();
|
||||||
for (int i = 0; i < times; i++) {
|
for (int i = 0; i < times; i++) {
|
||||||
roll[i] = random.nextInt(10) + 1;
|
roll[i] = random.nextInt(mD) + 1;
|
||||||
}
|
}
|
||||||
return roll;
|
return roll;
|
||||||
}
|
}
|
||||||
@@ -510,15 +295,6 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
|
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* a convince method that will update the edit text dice to what the current amount of dice is
|
|
||||||
*
|
|
||||||
* @author ricky barrette
|
|
||||||
*/
|
|
||||||
protected void updateView() {
|
|
||||||
dice.setText(mCurrent+"");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* starts Vibrator service and then vibrates for x milliseconds
|
* starts Vibrator service and then vibrates for x milliseconds
|
||||||
*
|
*
|
||||||
@@ -538,5 +314,17 @@ public class ExaltedDice extends Activity implements OnClickListener, OnLongClic
|
|||||||
*/
|
*/
|
||||||
vib.vibrate(milliseconds);
|
vib.vibrate(milliseconds);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onValueChange(NumberPicker picker, int oldVal, int newVal) {
|
||||||
|
switch(picker.getId()){
|
||||||
|
case R.id.d_Picker:
|
||||||
|
mD = Integer.parseInt(DICE_VALUES[newVal].substring(1));
|
||||||
|
mCurrentDie = newVal;
|
||||||
|
break;
|
||||||
|
case R.id.number_Picker:
|
||||||
|
mRolls = newVal;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
/**
|
|
||||||
* @author Twenty Codes, LLC
|
|
||||||
* @author ricky barrette
|
|
||||||
* @date Sep 20, 2010
|
|
||||||
*
|
|
||||||
* Source from com.android.internal.widget.NumberPickerButton;
|
|
||||||
* Copyright (C) 2008 The Android Open Source Project
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*/
|
|
||||||
package com.TwentyCode.android.ExaltedDice;
|
|
||||||
|
|
||||||
import android.content.Context;
|
|
||||||
import android.util.AttributeSet;
|
|
||||||
import android.view.KeyEvent;
|
|
||||||
import android.view.MotionEvent;
|
|
||||||
import android.widget.Button;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This class exists purely to cancel long click events.
|
|
||||||
*/
|
|
||||||
public class NumberPickerButton extends Button {
|
|
||||||
|
|
||||||
public NumberPickerButton(Context context, AttributeSet attrs, int defStyle) {
|
|
||||||
super(context, attrs, defStyle);
|
|
||||||
}
|
|
||||||
|
|
||||||
public NumberPickerButton(Context context, AttributeSet attrs) {
|
|
||||||
super(context, attrs);
|
|
||||||
}
|
|
||||||
|
|
||||||
public NumberPickerButton(Context context) {
|
|
||||||
super(context);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onTouchEvent(MotionEvent event) {
|
|
||||||
cancelLongpressIfRequired(event);
|
|
||||||
return super.onTouchEvent(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onTrackballEvent(MotionEvent event) {
|
|
||||||
cancelLongpressIfRequired(event);
|
|
||||||
return super.onTrackballEvent(event);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onKeyUp(int keyCode, KeyEvent event) {
|
|
||||||
if ((keyCode == KeyEvent.KEYCODE_DPAD_CENTER)
|
|
||||||
|| (keyCode == KeyEvent.KEYCODE_ENTER)) {
|
|
||||||
cancelLongpress();
|
|
||||||
}
|
|
||||||
return super.onKeyUp(keyCode, event);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cancelLongpressIfRequired(MotionEvent event) {
|
|
||||||
if ((event.getAction() == MotionEvent.ACTION_CANCEL)
|
|
||||||
|| (event.getAction() == MotionEvent.ACTION_UP)) {
|
|
||||||
cancelLongpress();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void cancelLongpress() {
|
|
||||||
if (R.id.up == getId()) {
|
|
||||||
ExaltedDice.cancelIncrement();
|
|
||||||
} else if (R.id.down == getId()) {
|
|
||||||
ExaltedDice.cancelDecrement();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
package com.TwentyCode.android.ExaltedDice;
|
|
||||||
|
|
||||||
/* The following code was written by Matthew Wiggins
|
|
||||||
* and is released under the APACHE 2.0 license
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
import android.hardware.SensorListener;
|
|
||||||
import android.hardware.SensorManager;
|
|
||||||
import android.content.Context;
|
|
||||||
import java.lang.UnsupportedOperationException;
|
|
||||||
|
|
||||||
@SuppressWarnings("deprecation")
|
|
||||||
public class ShakeListener implements SensorListener
|
|
||||||
{
|
|
||||||
private static final int FORCE_THRESHOLD = 350;
|
|
||||||
private static final int TIME_THRESHOLD = 100;
|
|
||||||
private static final int SHAKE_TIMEOUT = 500;
|
|
||||||
private static final int SHAKE_DURATION = 1000;
|
|
||||||
private static final int SHAKE_COUNT = 3;
|
|
||||||
|
|
||||||
private SensorManager mSensorMgr;
|
|
||||||
private float mLastX=-1.0f, mLastY=-1.0f, mLastZ=-1.0f;
|
|
||||||
private long mLastTime;
|
|
||||||
private OnShakeListener mShakeListener;
|
|
||||||
private Context mContext;
|
|
||||||
private int mShakeCount = 0;
|
|
||||||
private long mLastShake;
|
|
||||||
private long mLastForce;
|
|
||||||
|
|
||||||
public interface OnShakeListener
|
|
||||||
{
|
|
||||||
public void onShake();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ShakeListener(Context context)
|
|
||||||
{
|
|
||||||
mContext = context;
|
|
||||||
resume();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setOnShakeListener(OnShakeListener listener)
|
|
||||||
{
|
|
||||||
mShakeListener = listener;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void resume() {
|
|
||||||
mSensorMgr = (SensorManager)mContext.getSystemService(Context.SENSOR_SERVICE);
|
|
||||||
if (mSensorMgr == null) {
|
|
||||||
throw new UnsupportedOperationException("Sensors not supported");
|
|
||||||
}
|
|
||||||
boolean supported = mSensorMgr.registerListener(this, SensorManager.SENSOR_ACCELEROMETER, SensorManager.SENSOR_DELAY_GAME);
|
|
||||||
if (!supported) {
|
|
||||||
mSensorMgr.unregisterListener(this, SensorManager.SENSOR_ACCELEROMETER);
|
|
||||||
throw new UnsupportedOperationException("Accelerometer not supported");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void pause() {
|
|
||||||
if (mSensorMgr != null) {
|
|
||||||
mSensorMgr.unregisterListener(this, SensorManager.SENSOR_ACCELEROMETER);
|
|
||||||
mSensorMgr = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void onAccuracyChanged(int sensor, int accuracy) { }
|
|
||||||
|
|
||||||
public void onSensorChanged(int sensor, float[] values)
|
|
||||||
{
|
|
||||||
if (sensor != SensorManager.SENSOR_ACCELEROMETER) return;
|
|
||||||
long now = System.currentTimeMillis();
|
|
||||||
|
|
||||||
if ((now - mLastForce) > SHAKE_TIMEOUT) {
|
|
||||||
mShakeCount = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((now - mLastTime) > TIME_THRESHOLD) {
|
|
||||||
long diff = now - mLastTime;
|
|
||||||
float speed = Math.abs(values[SensorManager.DATA_X] + values[SensorManager.DATA_Y] + values[SensorManager.DATA_Z] - mLastX - mLastY - mLastZ) / diff * 10000;
|
|
||||||
if (speed > FORCE_THRESHOLD) {
|
|
||||||
if ((++mShakeCount >= SHAKE_COUNT) && (now - mLastShake > SHAKE_DURATION)) {
|
|
||||||
mLastShake = now;
|
|
||||||
mShakeCount = 0;
|
|
||||||
if (mShakeListener != null) {
|
|
||||||
mShakeListener.onShake();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mLastForce = now;
|
|
||||||
}
|
|
||||||
mLastTime = now;
|
|
||||||
mLastX = values[SensorManager.DATA_X];
|
|
||||||
mLastY = values[SensorManager.DATA_Y];
|
|
||||||
mLastZ = values[SensorManager.DATA_Z];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user