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

Imrpoved undo

Browse source
This commit is contained in:
Carlos Galindo 2015-03-04 23:51:47 +01:00
parent 0670be555f
commit 06673bdcd0
16 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/app.iml
View file

@ -12,9 +12,9 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" /> <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@ -25,7 +25,7 @@
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="false"> <component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@ -34,12 +34,12 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@ -88,6 +88,7 @@
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" /> <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
</component> </component>
</module> </module>

1
app/build.gradle
View file

@ -23,4 +23,5 @@ android {
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:21.0.3' compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:cardview-v7:21.0.3'
} }

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

@ -64,6 +64,7 @@ public class Introduction extends ActionBarActivity {
@Override @Override
public void onBackPressed() { public void onBackPressed() {
super.onBackPressed();
Toast.makeText( Toast.makeText(
getApplicationContext(), getApplicationContext(),
R.string.message_no_back_button_intro, R.string.message_no_back_button_intro,

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

@ -57,7 +57,6 @@ public class MainActivity extends ActionBarActivity{
.setColorFilter(Color.parseColor("#62BACE"), PorterDuff.Mode.SRC_IN); .setColorFilter(Color.parseColor("#62BACE"), PorterDuff.Mode.SRC_IN);
curativeEffortsBar.getProgressDrawable() curativeEffortsBar.getProgressDrawable()
.setColorFilter(Color.parseColor("#FFD700"), PorterDuff.Mode.SRC_IN); .setColorFilter(Color.parseColor("#FFD700"), PorterDuff.Mode.SRC_IN);
//TODO: use the negative PG bar, not curativeEfforts one
undo = false; undo = false;
//begin //begin
restoreData(); restoreData();
@ -77,7 +76,11 @@ public class MainActivity extends ActionBarActivity{
@Override @Override
public boolean onPrepareOptionsMenu (Menu menu) { public boolean onPrepareOptionsMenu (Menu menu) {
menu.findItem(R.id.action_undo).setVisible(undo); menu.findItem(R.id.action_undo).setEnabled(undo);
if (undo)
menu.findItem(R.id.action_undo).getIcon().setAlpha(255);
else
menu.findItem(R.id.action_undo).getIcon().setAlpha(128);
return true; return true;
} }
@ -120,7 +123,6 @@ public class MainActivity extends ActionBarActivity{
//levelUp //levelUp
//TODO: update defenses //TODO: update defenses
//TODO: add attack points when necessary //TODO: add attack points when necessary
//TODO: update currentPg button
//TODO: improve leveling up //TODO: improve leveling up
player.setMaxPgOnLevelUp(); player.setMaxPgOnLevelUp();
lvl.setText( lvl.setText(
@ -496,11 +498,13 @@ public class MainActivity extends ActionBarActivity{
undoObject = NULL; undoObject = NULL;
message = getString(R.string.action_undo_current_pg); message = getString(R.string.action_undo_current_pg);
} }
if (!message.isEmpty()) {
Toast.makeText( Toast.makeText(
getApplicationContext(), getApplicationContext(),
message, message,
Toast.LENGTH_LONG Toast.LENGTH_LONG
).show(); ).show();
}
pgUpdate(); pgUpdate();
undo = false; undo = false;
invalidateOptionsMenu(); invalidateOptionsMenu();
@ -599,7 +603,6 @@ public class MainActivity extends ActionBarActivity{
} }
//TODO: show on screen the max pg's
// if(progressBar.getId() == R.id.pgBar) { // if(progressBar.getId() == R.id.pgBar) {
// double rate = (double)current / progressBar.getMax() * (negative ? -1:1); // double rate = (double)current / progressBar.getMax() * (negative ? -1:1);
// if (rate <= 0) { // if (rate <= 0) {

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

@ -217,7 +217,7 @@ public class Player {
public void setRaceInt(int raceInt) {this.raceInt= raceInt;} public void setRaceInt(int raceInt) {this.raceInt= raceInt;}
public int getRaceInt() {return raceInt;} public int getRaceInt() {return raceInt;}
//TODO: implement time in the app //TODO: implement turns (for bonuses and continuous damage in the app
public void rest(boolean isLong) { public void rest(boolean isLong) {
if(isLong) { if(isLong) {
pg = maxPg; pg = maxPg;

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 383 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 798 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 269 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 490 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 475 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 678 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

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

@ -1,6 +1,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin" android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
@ -22,11 +24,11 @@
android:onClick="onNewClick" /> android:onClick="onNewClick" />
<Button <Button
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/load_character" android:text="@string/load_character"
android:id="@+id/loadCharacter" android:id="@+id/loadCharacter"
android:onClick="onLoadClick" android:onClick="onLoadClick" />
android:layout_marginTop="10dp" />
</LinearLayout> </LinearLayout>

4
app/src/main/res/menu/menu_main.xml
View file

@ -1,12 +1,12 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity"> xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
<!--TODO: create fancy responsive toasts--> <!--TODO: create fancy responsive toasts for undo's-->
<item <item
android:id="@+id/action_undo" android:id="@+id/action_undo"
android:title="@string/action_undo" android:title="@string/action_undo"
android:orderInCategory="1" android:orderInCategory="1"
app:showAsAction="never" app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_undo"/> android:icon="@drawable/ic_action_undo"/>
<item <item
android:id="@+id/action_cure" android:id="@+id/action_cure"

2
build.gradle
View file

@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:1.0.0' classpath 'com.android.tools.build:gradle:1.1.0'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files