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

Added stats dialog

Browse source
This commit is contained in:
Carlos Galindo 2015-05-10 21:40:20 +02:00
parent fc7edb1802
commit 2e472b83f9
19 changed files with 525 additions and 412 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/app.iml
View file

@ -19,6 +19,7 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
@ -81,6 +82,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />

1
app/src/main/java/com/kauron/dungeonmanager/Power.java
View file

@ -89,6 +89,7 @@ class Power implements Serializable{
void recover(int type){
if(this.freq <= type) used = false;
}
void setUsed(boolean used) {this.used = used;}
int getFreqColor(Context context) {
switch (freq) {

28
app/src/main/java/com/kauron/dungeonmanager/PowerAdapter.java
View file

@ -21,15 +21,31 @@ class PowerAdapter extends ArrayAdapter<Power> {
final Power attack = getItem(position);
if ( attack != null ) {
((TextView) mView.findViewById(R.id.name)).setText(attack.getName());
((TextView) mView.findViewById(R.id.keywords)).setText(attack.getKeywords());
((TextView) mView.findViewById(R.id.frequency)).setText(attack.getFrequencyString());
((TextView) mView.findViewById(R.id.range_and_distance)).setText(attack.getRangeString() + " " + attack.getDistance());
TextView name = (TextView) mView.findViewById(R.id.name);
TextView keywords = (TextView) mView.findViewById(R.id.keywords);
TextView frequency = (TextView) mView.findViewById(R.id.frequency);
TextView range = (TextView) mView.findViewById(R.id.range_and_distance);
name .setText(attack.getName());
keywords .setText(attack.getKeywords());
frequency .setText(attack.getFrequencyString());
range .setText(attack.getRangeString() + " " + attack.getDistance());
mView.setBackgroundColor(attack.getFreqColor(getContext()));
if (attack.isUsed())
if (attack.isUsed()) {
mView.getBackground().setAlpha(0);
else
int black = getContext().getResources().getColor(R.color.black);
name .setTextColor(black);
keywords .setTextColor(black);
frequency .setTextColor(black);
range .setTextColor(black);
//name.setPaintFlags(name.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
} else {
mView.getBackground().setAlpha((position % 2) * 50 + 205);
}
}
return mView;
}

407
app/src/main/java/com/kauron/dungeonmanager/ShowPlayer.java
View file

@ -35,12 +35,7 @@ import java.io.File;
import java.util.ArrayList;
public class ShowPlayer extends ActionBarActivity {
public static final int CURRENT_PG = 1, NULL = 0;
public Player player;
private boolean undo;
private int undoObject, undoPreviousValue;
private ProgressBar posHpBar, negHpBar, xpBar, surgesBar;
private TextView hpText, xpText, surgesText, levelText;
@ -83,7 +78,6 @@ public class ShowPlayer extends ActionBarActivity {
.setColorFilter(getResources().getColor(R.color.px_bar), PorterDuff.Mode.SRC_IN);
surgesBar.getProgressDrawable()
.setColorFilter(getResources().getColor(R.color.surges_bar), PorterDuff.Mode.SRC_IN);
undo = false;
restoreData();
invalidateOptionsMenu();
@ -176,18 +170,18 @@ public class ShowPlayer extends ActionBarActivity {
input.requestFocus();
return true;
} else if (id == R.id.action_time_long_rest) {
PowerAdapter powerAdapter = (PowerAdapter) powerList.getAdapter();
PowerAdapter powerAdapter = powerList == null ? null : (PowerAdapter) powerList.getAdapter();
if (powerAdapter != null) {
for (int i = 0; i < powerAdapter.getCount(); i++) {
Power power = powerAdapter.getItem(i);
if ( power.getFreq() != Power.AT_WILL) {
power.recover(Power.DAILY);
power.setUsed(false);
getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE)
.edit().putBoolean("used", false);
.edit().putBoolean("used", false).apply();
}
}
powerAdapter.notifyDataSetChanged();
//TODO: substitute all calls to refreshList for an update on the single view that changed
refreshList();
}
player.rest(true);
SnackbarManager.show(
@ -203,17 +197,17 @@ public class ShowPlayer extends ActionBarActivity {
hpUpdate();
surgeUpdate();
} else if (id == R.id.action_time_rest) {
PowerAdapter powerAdapter = (PowerAdapter) powerList.getAdapter();
PowerAdapter powerAdapter = powerList == null ? null : (PowerAdapter) powerList.getAdapter();
if (powerAdapter != null) {
for (int i = 0; i < powerAdapter.getCount(); i++) {
Power power = powerAdapter.getItem(i);
if ( power.getFreq() == Power.ENCOUNTER) {
power.recover(Power.ENCOUNTER);
power.setUsed(false);
getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE)
.edit().putBoolean("used", false);
.edit().putBoolean("used", false).apply();
}
}
refreshList();
powerAdapter.notifyDataSetChanged();
}
// player.rest(false); TODO: this isn't needed without action points
SnackbarManager.show(
@ -224,11 +218,22 @@ public class ShowPlayer extends ActionBarActivity {
);
hpUpdate();
surgeUpdate();
} else if (id == R.id.action_stats) {
statsDialog();
}
return super.onOptionsItemSelected(item);
}
private void statsDialog() {
final Dialog dialog = new Dialog(ShowPlayer.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.stats_dialog);
//TODO: finish him!
dialog.show();
Toast.makeText(getApplicationContext(), "Not ready yet", Toast.LENGTH_LONG).show();
}
private void levelUp() {
//TODO: improve leveling up by using a sliding guide
xpBar.setMax(Player.LEVEL_XP[player.getLevel()] -
@ -283,7 +288,7 @@ public class ShowPlayer extends ActionBarActivity {
.setTitle(R.string.new_energies)
.setPositiveButton(R.string.me, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
undoPreviousValue = player.getHp();
final int undoPreviousValue = player.getHp();
if (heal(true)) { //a surge has been used
SnackbarManager.show(
Snackbar.with(getApplicationContext())
@ -318,7 +323,7 @@ public class ShowPlayer extends ActionBarActivity {
.setNegativeButton(R.string.other, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int id) {
undoPreviousValue = player.getHp();
final int undoPreviousValue = player.getHp();
heal(false);
SnackbarManager.show(
Snackbar.with(getApplicationContext())
@ -377,19 +382,25 @@ public class ShowPlayer extends ActionBarActivity {
alert.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
try {
int preValue = player.getHp();
final int undoPreviousValue = player.getHp();
int damage = Integer.parseInt(input.getText().toString());
player.losePg(damage);
undo = true;
undoPreviousValue = preValue;
undoObject = CURRENT_PG;
SnackbarManager.show(
Snackbar.with(context).text(String.format(getString(R.string.lost_hp), damage))
.actionLabel(R.string.action_undo) // action button label
.actionListener(new ActionClickListener() {
@Override
public void onActionClicked(Snackbar snackbar) {
undo();
SnackbarManager.show(
Snackbar
.with(activity)
.text(R.string.restored)
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
);
player.setHp(undoPreviousValue);
p.edit().putInt("pg", player.getHp()).apply();
hpUpdate();
invalidateOptionsMenu();
}
})
.actionColor(getResources().getColor(R.color.yellow))
@ -485,30 +496,6 @@ public class ShowPlayer extends ActionBarActivity {
}
/**
* Undoes the last change done by the player. Only used in damage().
* Healing is undone in the health dialog
*/
private void undo() {
String message = "";
if(undoObject == CURRENT_PG){
player.setHp(undoPreviousValue);
undoObject = NULL;
message = getString(R.string.restored);
}
if (!message.isEmpty()) {
SnackbarManager.show(
Snackbar
.with(this)
.text(message)
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
);
}
hpUpdate();
undo = false;
invalidateOptionsMenu();
}
/**
* Launches the PowerEditor to create a new attack inside the current player
@ -537,180 +524,186 @@ public class ShowPlayer extends ActionBarActivity {
//TODO: check which is active (now there is only a power list), so there is only one possibility
int n = p.getInt("powers",0);
int elements = 0;
powerList = (ListView) findViewById(R.id.powerList);
final PowerAdapter adapter = (PowerAdapter) powerList.getAdapter();
if ( n == 0 ) {
findViewById(R.id.layout_no_powers).setVisibility(View.VISIBLE);
findViewById(R.id.layout_powers).setVisibility(View.GONE);
} else {
findViewById(R.id.layout_no_powers).setVisibility(View.GONE);
findViewById(R.id.layout_powers).setVisibility(View.VISIBLE);
int elements = 0;
powerList = (ListView) findViewById(R.id.powerList);
final PowerAdapter adapter = (PowerAdapter) powerList.getAdapter();
if ( adapter != null )
elements = adapter.getCount();
if ( elements < n && adapter != null ) {
for ( int i = elements; i < n; i++ ) {
SharedPreferences sav = getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE);
//TODO: solve error when closing the editor
adapter.add( new Power ( sav ) );
}
} else if ( n != 0 ) {
ArrayList<Power> powers = new ArrayList<>();
for (int i = 0; i < n; i++) {
SharedPreferences sav = getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE);
powers.add( new Power(sav) );
}
if (adapter != null)
elements = adapter.getCount();
if (elements < n && adapter != null) {
for (int i = elements; i < n; i++) {
SharedPreferences sav = getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE);
adapter.add(new Power(sav));
}
} else {
ArrayList<Power> powers = new ArrayList<>();
for (int i = 0; i < n; i++) {
SharedPreferences sav = getSharedPreferences(p.getString("power" + i, ""), MODE_PRIVATE);
powers.add(new Power(sav));
}
powerList.setAdapter(new PowerAdapter(this, powers));
final Activity activity = this;
powerList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, final int position, long id) {
powerList.setAdapter(new PowerAdapter(this, powers));
final Activity activity = this;
powerList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, final int position, long id) {
final Dialog dialog = new Dialog(ShowPlayer.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.attack_display);
final Dialog dialog = new Dialog(ShowPlayer.this);
dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
dialog.setContentView(R.layout.attack_display);
//identify all the elements from the VIEW and then add LISTENERS
final Power power = (Power) parent.getItemAtPosition(position);
View nameText = dialog.findViewById(R.id.nameText);
final int color = power.getFreqColor(getApplicationContext());
nameText.setBackgroundColor(color);
//identify all the elements from the VIEW and then add LISTENERS
final Power power = (Power) parent.getItemAtPosition(position);
View nameText = dialog.findViewById(R.id.nameText);
final int color = power.getFreqColor(getApplicationContext());
nameText.setBackgroundColor(color);
((TextView) nameText).setText(power.getName());
((TextView) dialog.findViewById(R.id.typeText)).setText(power.getTypeString());
((TextView) dialog.findViewById(R.id.rangeText)).setText(power.getRangeString() + " ");
((TextView) dialog.findViewById(R.id.freqText)).setText(power.getFrequencyString());
((TextView) dialog.findViewById(R.id.keywordsText)).setText(power.getKeywords());
((TextView) dialog.findViewById(R.id.distanceText)).setText(String.valueOf(power.getDistance()));
((TextView) dialog.findViewById(R.id.objectiveText)).setText(power.getObjective());
((TextView) dialog.findViewById(R.id.impactText)).setText(power.getImpact());
((TextView) dialog.findViewById(R.id.otherText)).setText(power.getOther());
((TextView) nameText).setText(power.getName());
((TextView) dialog.findViewById(R.id.typeText)).setText(power.getTypeString());
((TextView) dialog.findViewById(R.id.rangeText)).setText(power.getRangeString() + " ");
((TextView) dialog.findViewById(R.id.freqText)).setText(power.getFrequencyString());
((TextView) dialog.findViewById(R.id.keywordsText)).setText(power.getKeywords());
((TextView) dialog.findViewById(R.id.distanceText)).setText(String.valueOf(power.getDistance()));
((TextView) dialog.findViewById(R.id.objectiveText)).setText(power.getObjective());
((TextView) dialog.findViewById(R.id.impactText)).setText(power.getImpact());
((TextView) dialog.findViewById(R.id.otherText)).setText(power.getOther());
String[] attack = getResources().getStringArray(R.array.attack);
String[] defense = getResources().getStringArray(R.array.defense);
((TextView) dialog.findViewById(R.id.attackText)).setText(attack[power.getAtk()]
+ " " + getResources().getString(R.string.vs)
+ " " + defense[power.getDef()]);
String[] attack = getResources().getStringArray(R.array.attack);
String[] defense = getResources().getStringArray(R.array.defense);
((TextView) dialog.findViewById(R.id.attackText)).setText(attack[power.getAtk()]
+ " " + getResources().getString(R.string.vs) + " " + defense[power.getDef()]);
final Button useButton = (Button) dialog.findViewById(R.id.useButton);
final Button useButton = (Button) dialog.findViewById(R.id.useButton);
if (power.isUsed()) {
useButton.getBackground().setAlpha(128);
useButton.setEnabled(false);
useButton.setText(R.string.used);
useButton.setClickable(false);
} else {
useButton.setBackgroundColor(color);
useButton.setTextColor(getResources().getColor(R.color.white));
useButton.getBackground().setAlpha(255);
useButton.setEnabled(true);
useButton.setClickable(true);
useButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//TODO: use power
power.use();
if (power.isUsed()) {
useButton.getBackground().setAlpha(128);
useButton.setTextColor(getResources().getColor(R.color.black));
useButton.setEnabled(false);
useButton.setClickable(false);
getSharedPreferences(p.getString("power" + position, ""), MODE_PRIVATE)
.edit().putBoolean("used", true).apply();
refreshList();
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(getString(R.string.have_used) + " " + power.getName())
.actionListener(new ActionClickListener() {
@Override
public void onActionClicked(Snackbar snackbar) {
power.setUsed(false);
useButton.setBackgroundColor(color);
useButton.setTextColor(getResources().getColor(R.color.white));
useButton.getBackground().setAlpha(255);
useButton.setEnabled(true);
useButton.setClickable(true);
getSharedPreferences(p.getString("power" + position, ""), MODE_PRIVATE)
.edit().putBoolean("used", power.isUsed()).apply();
refreshList();
}
})
.actionLabel(getString(R.string.action_undo))
.actionColor(getResources().getColor(R.color.yellow))
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE),
activity
);
} else {
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(getString(R.string.have_used) + " " + power.getName())
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE),
activity
);
}
dialog.dismiss();
if (power.isUsed()) {
useButton.getBackground().setAlpha(128);
useButton.setEnabled(false);
useButton.setClickable(false);
} else {
useButton.setBackgroundColor(color);
useButton.setTextColor(getResources().getColor(R.color.white));
useButton.getBackground().setAlpha(255);
useButton.setEnabled(true);
useButton.setClickable(true);
useButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
//TODO: use power
power.use();
if (power.isUsed()) {
useButton.getBackground().setAlpha(128);
useButton.setTextColor(getResources().getColor(R.color.black));
useButton.setEnabled(false);
useButton.setClickable(false);
getSharedPreferences(p.getString("power" + position, ""), MODE_PRIVATE)
.edit().putBoolean("used", true).apply();
refreshList();
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(getString(R.string.used) + " " + power.getName())
.actionListener(new ActionClickListener() {
@Override
public void onActionClicked(Snackbar snackbar) {
power.recover(Power.DAILY);
useButton.setBackgroundColor(color);
useButton.setTextColor(getResources().getColor(R.color.white));
useButton.getBackground().setAlpha(255);
useButton.setEnabled(true);
useButton.setClickable(true);
getSharedPreferences(p.getString("power" + position, ""), MODE_PRIVATE)
.edit().putBoolean("used", false).apply();
refreshList();
}
})
.actionLabel(getString(R.string.action_undo))
.actionColor(getResources().getColor(R.color.yellow))
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE),
activity
);
} else {
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(getString(R.string.used) + " " + power.getName())
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE),
activity
);
}
dialog.dismiss();
}
});
});
}
dialog.show();
}
dialog.show();
});
}
final Activity thisActivity = this;
powerList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
@Override
public boolean onItemLongClick(final AdapterView<?> parent, View view, final int position, long id) {
AlertDialog.Builder alert = new AlertDialog.Builder(thisActivity);
alert.setItems(
new String[]{getString(R.string.delete), getString(R.string.edit)},
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == 0) {
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(R.string.sure)
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
.actionLabel(R.string.delete)
.actionColor(getResources().getColor(R.color.yellow))
.actionListener(new ActionClickListener() {
@Override
public void onActionClicked(Snackbar snackbar) {
//delete the item
String name = p.getString("power" + position, "");
if (name != null && !name.isEmpty()) {
getSharedPreferences(name, MODE_PRIVATE).edit().clear().apply();
Log.d("Tag", thisActivity.getApplicationContext().getFilesDir().getParent()
+ File.separator + "shared_prefs" + File.separator + name + ".xml");
try {
if (!new File(thisActivity.getApplicationContext().getFilesDir().getParent()
+ File.separator + "shared_prefs" + File.separator + name + ".xml").delete())
throw new Exception();
} catch (Exception e) {
Log.e("POWER:DELETION", "Error deleting attack files\n" + e.getMessage() + "\n");
}
int max = p.getInt("powers", 0);
SharedPreferences.Editor ed = p.edit();
for (int i = position; i < max - 1; i++)
ed.putString("power" + i, p.getString("power" + (i + 1), "max"));
ed.putInt("powers", max - 1).apply();
refreshList();
ed.remove("power" + (max - 1)).apply();
}
}
}),
thisActivity
);
} else {
//edit the item
startActivity(
new Intent(getApplicationContext(), PowerEditor.class)
.putExtra("power", position)
.putExtra("player", player.getName())
);
}
}
});
alert.show();
return true;
}
});
}
final Activity thisActivity = this;
powerList.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
@Override
public boolean onItemLongClick(final AdapterView<?> parent, View view, final int position, long id) {
AlertDialog.Builder alert = new AlertDialog.Builder(thisActivity);
alert.setItems(
new String[]{getString(R.string.delete), getString(R.string.edit)},
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
if (which == 0) {
SnackbarManager.show(
Snackbar.with(getApplicationContext())
.text(R.string.sure)
.duration(Snackbar.SnackbarDuration.LENGTH_INDEFINITE)
.actionLabel(R.string.delete)
.actionColor(getResources().getColor(R.color.yellow))
.actionListener(new ActionClickListener() {
@Override
public void onActionClicked(Snackbar snackbar) {
//delete the item
String name = p.getString("power" + position, "");
if (name != null && !name.isEmpty()) {
getSharedPreferences(name, MODE_PRIVATE).edit().clear().apply();
Log.d("Tag", thisActivity.getApplicationContext().getFilesDir().getParent()
+ File.separator + "shared_prefs" + File.separator + name + ".xml");
try {
if (!new File(thisActivity.getApplicationContext().getFilesDir().getParent()
+ File.separator + "shared_prefs" + File.separator + name + ".xml").delete())
throw new Exception();
} catch (Exception e) {
Log.e("POWER:DELETION", "Error deleting attack files\n" + e.getMessage() + "\n" + e.getStackTrace().toString());
}
int max = p.getInt("powers", 0);
SharedPreferences.Editor ed = p.edit();
for (int i = position; i < max - 1; i++)
ed.putString("power" + i, p.getString("power" + (i + 1), "max"));
ed.putInt("powers", max - 1).apply();
refreshList();
ed.remove("power" + (max - 1)).apply();
}
}
}),
thisActivity
);
} else {
//edit the item
startActivity(
new Intent(getApplicationContext(), PowerEditor.class)
.putExtra("power", position)
.putExtra("player", player.getName())
);
}
}
});
alert.show();
return true;
}
});
}
}

BIN
app/src/main/res/drawable-hdpi/ic_action_stats.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 784 B

BIN
app/src/main/res/drawable-hdpi/ic_action_time.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 647 B

After

Width:  |  Height:  |  Size: 623 B

BIN
app/src/main/res/drawable-mdpi/ic_action_stats.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 525 B

BIN
app/src/main/res/drawable-mdpi/ic_action_time.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 460 B

After

Width:  |  Height:  |  Size: 397 B

BIN
app/src/main/res/drawable-xhdpi/ic_action_stats.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_action_time.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 871 B

After

Width:  |  Height:  |  Size: 831 B

BIN
app/src/main/res/drawable-xxhdpi/ic_action_stats.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_action_time.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

217
app/src/main/res/layout/activity_show_player.xml
View file

@ -210,190 +210,37 @@
android:text="Go to abilities"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/layout_powers"
android:orientation="vertical">
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/powerList"
android:layout_gravity="center_horizontal"
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:choiceMode="none" />
<TextView
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:id="@+id/help_text"
android:text="@string/help_list" />
</LinearLayout>
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/powerList"
android:layout_gravity="center_horizontal"
android:divider="@android:color/transparent"
android:dividerHeight="0dp"
android:choiceMode="none" />
<!--<LinearLayout-->
<!--android:id="@+id/attackContainer"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="10dp"-->
<!--android:orientation="vertical"-->
<!--android:visibility="gone">-->
<!--<TextView-->
<!--android:id="@+id/titleAttack"-->
<!--android:text="@string/attack"-->
<!--android:textAllCaps="true"-->
<!--android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"-->
<!--android:layout_marginBottom="5dp"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:textStyle="bold"-->
<!--android:textColor="?android:textColorSecondary"-->
<!--android:textSize="14sp"-->
<!--android:gravity="center_vertical"-->
<!--android:paddingLeft="8dip"-->
<!--android:paddingRight="8dip"/>-->
<!--<HorizontalScrollView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content">-->
<!--<GridLayout-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:id="@+id/attackGrid"-->
<!--android:columnCount="3"-->
<!--android:rowCount="2">-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="0"-->
<!--android:layout_column="0"-->
<!--android:id="@+id/STR"-->
<!--tools:text="@string/FUE" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="1"-->
<!--android:layout_column="0"-->
<!--android:id="@+id/CON"-->
<!--tools:text="@string/CON" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="0"-->
<!--android:layout_column="1"-->
<!--android:id="@+id/DEX"-->
<!--tools:text="@string/DES" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="1"-->
<!--android:layout_column="1"-->
<!--android:id="@+id/INT"-->
<!--tools:text="@string/INT" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="0"-->
<!--android:layout_column="2"-->
<!--android:id="@+id/WIS"-->
<!--tools:text="@string/SAB" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="4"-->
<!--android:layout_row="1"-->
<!--android:layout_column="2"-->
<!--android:id="@+id/CHA"-->
<!--tools:text="@string/CAR" />-->
<!--</GridLayout>-->
<!--</HorizontalScrollView>-->
<!--</LinearLayout>-->
<!--<LinearLayout-->
<!--android:id="@+id/defenseContainer"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginTop="10dp"-->
<!--android:visibility="gone"-->
<!--android:orientation="vertical">-->
<!--<TextView-->
<!--android:id="@+id/titleDefense"-->
<!--android:text="@string/defense"-->
<!--android:textAllCaps="true"-->
<!--android:layout_marginBottom="5dp"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:textStyle="bold"-->
<!--android:textColor="?android:textColorSecondary"-->
<!--android:textSize="14sp"-->
<!--android:gravity="center_vertical"-->
<!--android:paddingLeft="8dip"-->
<!--android:paddingRight="8dip"/>-->
<!--<GridLayout-->
<!--android:layout_width="fill_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:id="@+id/defenseGrid"-->
<!--android:columnCount="2"-->
<!--android:rowCount="2">-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="5"-->
<!--android:layout_row="0"-->
<!--android:layout_column="0"-->
<!--android:id="@+id/CA"-->
<!--tools:text="@string/CA" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="5"-->
<!--android:layout_row="0"-->
<!--android:layout_column="1"-->
<!--android:id="@+id/FORT"-->
<!--tools:text="@string/FORT" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="5"-->
<!--android:layout_row="1"-->
<!--android:layout_column="0"-->
<!--android:id="@+id/REF"-->
<!--tools:text="@string/REF" />-->
<!--<TextView-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:textAppearance="?android:attr/textAppearanceLarge"-->
<!--android:typeface="monospace"-->
<!--android:ems="5"-->
<!--android:layout_row="1"-->
<!--android:layout_column="1"-->
<!--android:id="@+id/VOL"-->
<!--tools:text="@string/VOL" />-->
<!--</GridLayout>-->
<!--</LinearLayout>-->
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:visibility="gone"
android:id="@+id/layout_no_powers">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/no_powers"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/activity_welcome.xml
View file

@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/help_text"
android:text="@string/help_welcome_text"
android:text="@string/help_list"
android:layout_gravity="center"/>
</LinearLayout>

3
app/src/main/res/layout/power_row.xml
View file

@ -5,8 +5,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
tools:background="@color/at_will"
android:paddingLeft="5dp"
android:paddingRight="5dp">
android:padding="5dp">
<TextView
tools:text="Happiness"

186
app/src/main/res/layout/stats_dialog.xml Normal file
View file

@ -0,0 +1,186 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/attackContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/titleAttack"
android:text="Attack"
android:textAllCaps="true"
android:drawableBottom="?android:attr/listChoiceBackgroundIndicator"
android:layout_marginBottom="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
android:gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<GridLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/attackGrid"
android:columnCount="3"
android:rowCount="2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="0"
android:id="@+id/STR"
tools:text="@string/STR" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="0"
android:id="@+id/CON"
tools:text="@string/CON" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="1"
android:id="@+id/DEX"
tools:text="@string/DEX" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="1"
android:id="@+id/INT"
tools:text="@string/INT" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="0"
android:layout_column="2"
android:id="@+id/WIS"
tools:text="@string/WIS" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="4"
android:layout_row="1"
android:layout_column="2"
android:id="@+id/CHA"
tools:text="@string/CHA" />
</GridLayout>
</HorizontalScrollView>
</LinearLayout>
<LinearLayout
android:id="@+id/defenseContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:visibility="gone"
android:orientation="vertical">
<TextView
android:id="@+id/titleDefense"
android:text="Defense"
android:textAllCaps="true"
android:layout_marginBottom="5dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="?android:textColorSecondary"
android:textSize="14sp"
android:gravity="center_vertical"
android:paddingLeft="8dip"
android:paddingRight="8dip"/>
<GridLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/defenseGrid"
android:columnCount="2"
android:rowCount="2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="5"
android:layout_row="0"
android:layout_column="0"
android:id="@+id/CA"
tools:text="AC" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="5"
android:layout_row="0"
android:layout_column="1"
android:id="@+id/FORT"
tools:text="FORT" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="5"
android:layout_row="1"
android:layout_column="0"
android:id="@+id/REF"
tools:text="REF" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:typeface="monospace"
android:ems="5"
android:layout_row="1"
android:layout_column="1"
android:id="@+id/VOL"
tools:text="VOL" />
</GridLayout>
</LinearLayout>
</LinearLayout>

7
app/src/main/res/menu/menu_show_player.xml
View file

@ -34,4 +34,11 @@
</menu>
</item>
<item
android:id="@+id/action_stats"
android:title="@string/show_stats"
android:orderInCategory="10"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_stats" />
</menu>

64
app/src/main/res/values-es/strings.xml
View file

@ -38,7 +38,7 @@
<string name="add_player">Añadir personaje</string>
<string name="delete">Borrar</string>
<string name="edit">Editar</string>
<string name="help_welcome_text">Toca un jugador para seleccionarlo, mantén pulsado para opciones</string>
<string name="help_list">Toca para abrir, mantén pulsado para opciones</string>
<string name="impact">Impacto</string>
<string name="impactEditHint">1d6 + 4 y eres invisible</string>
<string name="keywords">Palabras clave</string>
@ -104,7 +104,7 @@
<item>Carisma</item>
</string-array>
<string-array name="defence">
<string-array name="defense">
<item>Defensa</item>
<item>CA</item>
<item>Fortaleza</item>
@ -112,10 +112,66 @@
<item>Voluntad</item>
</string-array>
<string-array name="abilities">
<item>Habilidad</item>
<item>Acrobacias</item>
<item>Arcanos</item>
<item>Atletismo</item>
<item>BLUFF</item>
<item>Diplomacia</item>
<item>Dungeons</item>
<item>ENDURANCE</item>
<item>Sanar</item>
<item>Historia</item>
<item>INSIGHT</item>
<item>Intimidación</item>
<item>Naturaleza</item>
<item>Percepción</item>
<item>Religión</item>
<item>STEALTH</item>
<item>STREETWISE</item>
<item>Hurto</item>
</string-array>
<string-array name="classes">
<item>Clase</item>
<item>Ardiente</item>
<item>Brujo</item>
<item>Buscador</item>
<item>Clérigo</item>
<item>Explorador</item>
<item>Guerrero</item>
<item>Mago</item>
<item>Mente de Batalla</item>
<item>Monje</item>
<item>Paladín</item>
<item>Pícaro</item>
<item>Psiónico</item>
<item>Sacerdote Rúnico</item>
<item>Señor de la Guerra</item>
</string-array>
<string-array name="races">
<item>Race</item>
<item>Dracónidos</item>
<item>Eladrines</item>
<item>Elfos</item>
<item>Enanos</item>
<item>Gitzerai</item>
<item>Humanos</item>
<item>Medianos</item>
<item>Mente del Fragmento</item>
<item>Minotauro</item>
<item>Salvaje</item>
<item>Semielfo</item>
<item>Tiflin</item>
</string-array>
<string name="required">Este campo es obligatorio</string>
<string name="sure">¿Estás seguro?</string>
<string name="used">Has usado</string>
<string name="used">Usado</string>
<string name="have_used">Has usado</string>
<string name="restored">Valores restaurados</string>
<string name="export">Exportar</string>
<string name="healed">Has recuperado %d PG</string>
@ -123,4 +179,6 @@
<string name="lost_hp">Has perdido %d PG</string>
<string name="level_up">Subir un nivel</string>
<string name="use">Usar</string>
<string name="no_powers">No tienes poderes, añade uno</string>
<string name="show_stats">Mostrar ataque/defensa</string>
</resources>

20
app/src/main/res/values/strings.xml
View file

@ -48,7 +48,7 @@
<string name="add_player">Add player</string>
<string name="zero" translatable="false">0</string>
<string name="no_players">No players, please add one</string>
<string name="help_welcome_text">Press a player to open, hold for options</string>
<string name="help_list">Press to open, hold for options</string>
<string name="name">Name</string>
<string name="keywords">Keywords</string>
<string name="powerNameHint">Blasting charm</string>
@ -61,7 +61,8 @@
<string name="objective">Objective</string>
<string name="objectiveHint">One creature</string>
<string name="required">This field is required</string>
<string name="used">You have used</string>
<string name="used">Used</string>
<string name="have_used">You have used</string>
<string name="sure">Are you sure?</string>
<string name="healed">You have restored %d HP</string>
<string name="restored">Values restored</string>
@ -149,22 +150,23 @@
<item>Thievery</item>
</string-array>
<!-- TODO: correctly translate and order the classes-->
<string-array name="classes">
<item>Class</item>
<item>Ardiente</item>
<item>Brujo</item>
<item>Warlock</item>
<item>Buscador</item>
<item>Clérigo</item>
<item>Explorador</item>
<item>Guerrero</item>
<item>Mago</item>
<item>Cleric</item>
<item>Explorer</item>
<item>Warrior</item>
<item>Wizard</item>
<item>Mente de Batalla</item>
<item>Monje</item>
<item>Paladín</item>
<item>Pícaro</item>
<item>Psiónico</item>
<item>Sacerdote Rúnico</item>
<item>Señor de la Guerra</item>
<item>Warlord</item>
</string-array>
<string-array name="races">
@ -187,5 +189,7 @@
<string name="lost_hp">Lost %d HP</string>
<string name="level_up">Level up</string>
<string name="use">Use</string>
<string name="no_powers">There are no powers, try creating one</string>
<string name="show_stats">Show attack/defense</string>
</resources>