1
0
Fork 0
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

View file

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

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.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.setRaceName(p.getString("raceName", getString(com.kauron.dungeonmanager.R.string.race_name)));
player.setLevel(p.getInt("level", 1)); player.setLevel(p.getInt("level", 1));
//TODO: restore pg
player.setAtk(new int[]{ player.setAtk(new int[]{
p.getInt("fue", 10), p.getInt("fue", 10),
p.getInt("con", 10), p.getInt("con", 10),
@ -348,10 +347,10 @@ public class MainActivity extends ActionBarActivity
getString(com.kauron.dungeonmanager.R.string.CA) + ": " + player.getCa() getString(com.kauron.dungeonmanager.R.string.CA) + ": " + player.getCa()
); );
((TextView) findViewById(com.kauron.dungeonmanager.R.id.FORT)).setText( ((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( ((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( ((TextView) findViewById(com.kauron.dungeonmanager.R.id.VOL)).setText(
getString(com.kauron.dungeonmanager.R.string.VOL) + ": " + player.getVol() 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() { private void undo() {
String message = ""; String message = "";
if(undoObject == CURRENT_PG){ if(undoObject == CURRENT_PG){

Binary file not shown.

Before

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 478 B

View file

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

View file

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

View file

@ -11,23 +11,13 @@
android:id="@+id/action_cure" android:id="@+id/action_cure"
android:title="@string/action_cure" android:title="@string/action_cure"
android:orderInCategory="2" android:orderInCategory="2"
app:showAsAction="always" 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"/>-->
<item <item
android:id="@+id/action_edit_basics" android:id="@+id/action_edit_basics"
android:title="@string/action_edit_basics" android:title="@string/action_edit_basics"
android:orderInCategory="20" android:orderInCategory="20"
app:showAsAction="ifRoom" app:showAsAction="never"
android:icon="@drawable/ic_action_edit"/> android:icon="@drawable/ic_action_edit"/>
<item <item
android:id="@+id/action_reset" android:id="@+id/action_reset"