kauron/DungeonManager
kauron/DungeonManager
Archived
1
0
Fork 0
Code Releases Activity

CEff correction

Browse source
This commit is contained in:
Carlos Galindo 2015-02-23 23:53:28 +01:00
commit ca51347522
15 changed files with 108 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

64
app/src/main/java/com/kauron/dungeonmanager/HealthDialogFragment.java
View file

@ -1,64 +0,0 @@
package com.kauron.dungeonmanager;
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.content.DialogInterface;
import android.os.Bundle;
public class HealthDialogFragment extends DialogFragment {
//TODO: convert to method and dialog, without class
static HealthDialogFragment newInstance(int curativeEfforts) {
HealthDialogFragment f = new HealthDialogFragment();
Bundle args = new Bundle();
args.putInt("curativeEfforts", curativeEfforts);
f.setArguments(args);
return f;
}
public interface HealthDialogListener {
public void heal(DialogFragment dialog, boolean uses);
}
HealthDialogListener mListener;
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
try{
mListener = (HealthDialogListener) activity;
}catch(ClassCastException e){
throw new ClassCastException(activity.toString() + " must implement HealthDialogListener");
}
}
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setMessage(com.kauron.dungeonmanager.R.string.new_energies_message)
.setTitle(com.kauron.dungeonmanager.R.string.new_energies)
.setPositiveButton(com.kauron.dungeonmanager.R.string.me, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
mListener.heal(HealthDialogFragment.this, true);
}
})
.setNegativeButton(com.kauron.dungeonmanager.R.string.other, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
mListener.heal(HealthDialogFragment.this, false);
}
})
.setNeutralButton(com.kauron.dungeonmanager.R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
return builder.create();
}
}

2
app/src/main/java/com/kauron/dungeonmanager/Introduction.java
View file

@ -67,7 +67,7 @@ public class Introduction extends ActionBarActivity {
int id = item.getItemId();
//noinspection SimplifiableIfStatement
if (id == com.kauron.dungeonmanager.R.id.action_finish) {
if (id == com.kauron.dungeonmanager.R.id.action_save) {
if(finished()) {
this.finish();
} else {

88
app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
View file

@ -19,8 +19,7 @@ import android.widget.TextView;
import android.widget.Toast;
public class MainActivity extends ActionBarActivity
implements HealthDialogFragment.HealthDialogListener{
public class MainActivity extends ActionBarActivity{
public static final int CURRENT_PG = 1, NULL = 0;
@ -49,8 +48,6 @@ public class MainActivity extends ActionBarActivity
return true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
@ -60,7 +57,15 @@ public class MainActivity extends ActionBarActivity
//noinspection SimplifiableIfStatement
if (id == com.kauron.dungeonmanager.R.id.action_cure) {
showHealthDialog();
if(player.getMaxPg() <= player.getPg()){
Toast.makeText(
getApplicationContext(),
R.string.maxed_curative,
Toast.LENGTH_LONG
).show();
} else {
healDialog();
}
return true;
} else if (id == com.kauron.dungeonmanager.R.id.action_edit_basics) {
//TODO: try this startChildActivity()
@ -76,7 +81,6 @@ public class MainActivity extends ActionBarActivity
undo();
return true;
} else if (id == com.kauron.dungeonmanager.R.id.action_reset) {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle(getString(com.kauron.dungeonmanager.R.string.reset_confirmation_title));
alert.setMessage(getString(com.kauron.dungeonmanager.R.string.reset_confirmation));
@ -99,50 +103,22 @@ public class MainActivity extends ActionBarActivity
});
alert.show();
// } else if (id == R.id.action_save) {
// saveData();
// } else if (id == R.id.action_load) {
// restoreData();
}
return super.onOptionsItemSelected(item);
}
public void showHealthDialog(){
DialogFragment dialog = HealthDialogFragment.newInstance(player.getCurativeEfforts());
dialog.show(getFragmentManager(), "HealthDialogFragment");
}
@Override
protected void onPause() {
super.onPause();
Log.e("UTIL", "pause");
}
@Override
protected void onResume() {
super.onResume();
Log.e("UTIL", "resume");
restoreData();
healthStatusCheck();
updateCurativeString();
}
@Override
protected void onStop() {
super.onStop();
Log.e("UTIL", "stop");
}
@Override
protected void onDestroy() {
super.onDestroy();
Log.e("UTIL", "destroy");
}
@Override
public void heal(DialogFragment dialog, boolean uses) {
int hasCured = player.recoverPg(Player.USE_CURATIVE_EFFORT, uses);
public void heal(boolean usesEffort
) {
int hasCured = player.recoverPg(Player.USE_CURATIVE_EFFORT, usesEffort);
if (hasCured == Player.NOT_CURED) {
Toast.makeText(
getApplicationContext(),
@ -166,6 +142,30 @@ public class MainActivity extends ActionBarActivity
}
}
public void healDialog() {
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setMessage(com.kauron.dungeonmanager.R.string.new_energies_message)
.setTitle(com.kauron.dungeonmanager.R.string.new_energies)
.setPositiveButton(com.kauron.dungeonmanager.R.string.me, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
heal(true);
}
})
.setNegativeButton(com.kauron.dungeonmanager.R.string.other, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
heal(false);
}
})
.setNeutralButton(com.kauron.dungeonmanager.R.string.cancel, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
dialog.cancel();
}
});
alert.show();
}
public void damage(final View view){
AlertDialog.Builder alert = new AlertDialog.Builder(this);
alert.setTitle(getString(com.kauron.dungeonmanager.R.string.suffer_damage));
@ -310,8 +310,8 @@ public class MainActivity extends ActionBarActivity
});
}
player.setPg(p.getInt("pg", player.getMaxPg()));
player.setCurativeEffort(p.getInt("curativeEfforts", player.getCurativeEfforts()));
player.setPg(p.getInt("pg", player.getPg()));
healthStatusCheck();
updateCurativeString();
//set restored values to the respective fields
@ -371,11 +371,11 @@ public class MainActivity extends ActionBarActivity
private void updateCurativeString() {
((TextView) findViewById(com.kauron.dungeonmanager.R.id.curativeEffortsText)).setText(
getString(com.kauron.dungeonmanager.R.string.curative_display_text1) + " " +
player.getCurativeEfforts() + " " +
getString(com.kauron.dungeonmanager.R.string.curative_display_text2) + " " +
player.getMaxCurativeEfforts() + " " +
getString(com.kauron.dungeonmanager.R.string.curative_display_text3)
getString(
R.string.curative_display_text,
player.getCurativeEfforts(),
player.getMaxCurativeEfforts()
)
);
}