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

Update

Browse source
This commit is contained in:
Carlos Galindo 2015-02-23 15:37:55 +01:00
parent 20e37b935b
commit 58da5de755
9 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -5,7 +5,7 @@ android {
buildToolsVersion "21.1.2"
defaultConfig {
applicationId 'com.kauron.dungeonmanager'
minSdkVersion 15
minSdkVersion 16
targetSdkVersion 21
versionCode 1
versionName "1.0"

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

@ -300,7 +300,6 @@ public class MainActivity extends ActionBarActivity
player.setClassName(p.getString("className", getString(com.kauron.dungeonmanager.R.string.class_name)));
player.setRaceName(p.getString("raceName", getString(com.kauron.dungeonmanager.R.string.race_name)));
player.setLevel(p.getInt("level", 1));
//TODO: restore pg
player.setAtk(new int[]{
p.getInt("fue", 10),
p.getInt("con", 10),
@ -348,10 +347,10 @@ public class MainActivity extends ActionBarActivity
getString(com.kauron.dungeonmanager.R.string.CA) + ": " + player.getCa()
);
((TextView) findViewById(com.kauron.dungeonmanager.R.id.FORT)).setText(
getString(com.kauron.dungeonmanager.R.string.FORT) + ": " + player.getFort()
getString(com.kauron.dungeonmanager.R.string.FORT) + ":" + player.getFort()
);
((TextView) findViewById(com.kauron.dungeonmanager.R.id.REF)).setText(
getString(com.kauron.dungeonmanager.R.string.REF) + ": " + player.getRef()
getString(com.kauron.dungeonmanager.R.string.REF) + ":" + player.getRef()
);
((TextView) findViewById(com.kauron.dungeonmanager.R.id.VOL)).setText(
getString(com.kauron.dungeonmanager.R.string.VOL) + ": " + player.getVol()
@ -380,6 +379,10 @@ public class MainActivity extends ActionBarActivity
);
}
public void selectPlayer(View view) {
//TODO: implement players and switch between them
}
private void undo() {
String message = "";
if(undoObject == CURRENT_PG){

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 282 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 220 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 321 B

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

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 478 B

1
app/src/main/res/layout/activity_main.xml
View file

@ -20,6 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/pgCurrent"
android:onClick="selectPlayer"
android:id="@+id/scroll1">
<RelativeLayout
android:orientation="vertical"

2
app/src/main/res/menu/menu_introduction.xml
View file

@ -5,6 +5,6 @@
<item android:id="@+id/action_finish"
android:title="@string/action_finish"
android:orderInCategory="100"
android:icon="@drawable/ic_action_done"
android:icon="@drawable/ic_action_save"
app:showAsAction="ifRoom" />
</menu>

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

@ -11,23 +11,13 @@
android:id="@+id/action_cure"
android:title="@string/action_cure"
android:orderInCategory="2"
app:showAsAction="always"
android:icon="@drawable/ic_action_heal"/>
<!--<item-->
<!--android:id="@+id/action_load"-->
<!--android:title="@string/action_load"-->
<!--android:orderInCategory="10"-->
<!--app:showAsAction="never"/>-->
<!--<item-->
<!--android:id="@+id/action_save"-->
<!--android:title="@string/action_save"-->
<!--android:orderInCategory="11"-->
<!--app:showAsAction="never"/>-->
app:showAsAction="always"/>
<item
android:id="@+id/action_edit_basics"
android:title="@string/action_edit_basics"
android:orderInCategory="20"
app:showAsAction="ifRoom"
app:showAsAction="never"
android:icon="@drawable/ic_action_edit"/>
<item
android:id="@+id/action_reset"