From 58da5de7555c742b3f5e06b555a4de84af40191f Mon Sep 17 00:00:00 2001 From: Carlos Galindo Date: Mon, 23 Feb 2015 15:37:55 +0100 Subject: [PATCH] Update --- app/build.gradle | 2 +- .../com/kauron/dungeonmanager/MainActivity.java | 9 ++++++--- .../main/res/drawable-hdpi/ic_action_done.png | Bin 282 -> 0 bytes .../main/res/drawable-mdpi/ic_action_done.png | Bin 220 -> 0 bytes .../main/res/drawable-xhdpi/ic_action_done.png | Bin 321 -> 0 bytes .../main/res/drawable-xxhdpi/ic_action_done.png | Bin 478 -> 0 bytes app/src/main/res/layout/activity_main.xml | 1 + app/src/main/res/menu/menu_introduction.xml | 2 +- app/src/main/res/menu/menu_main.xml | 16 +++------------- 9 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_done.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_done.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_done.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_done.png diff --git a/app/build.gradle b/app/build.gradle index 0bc1625..286a855 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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" diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java index d1d7f8c..bec0bd3 100644 --- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java +++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java @@ -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){ diff --git a/app/src/main/res/drawable-hdpi/ic_action_done.png b/app/src/main/res/drawable-hdpi/ic_action_done.png deleted file mode 100644 index f33c5df19171d7b11245f776c5597a584b14f752..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0p{PA?}=o~m~_!xHH zw^A|27-LLe@;t9$|MFE0P{#~6IL4-GfK%ZfXV_5LN)VvjdL;}{PQ8i%hlByXUoQq|VHbxu!8xvQn>_` gv}lYm#+VOs26${_E2dh(;Q#;t07*qoM6N<$fygV170LqhB{sZhwCZE+SlW1lr=z*SLcGJe zp~6t${o=}Z3%i-wOt{!=1o@WcSR}AsY!Erh945&dQEF4bJ1NkB%Z<^Nk>P_COO%lN S3^$;289ZJ6T-G@yGywo%I7s*a diff --git a/app/src/main/res/drawable-xhdpi/ic_action_done.png b/app/src/main/res/drawable-xhdpi/ic_action_done.png deleted file mode 100644 index 65ea25618cfe0234fc959dcbf7bf4d2165d29079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC3+0aSW-r^>&sf-=P2o7eyVR z*2gR?Ch7+gb~5lCXWby-*WfgvfJuhyq)^pzqeUu97QONP{e16}pJ|_#*RKr$8UzAH zosW0uT`y9Z-N$J1B+{)&fBB}jQU~rXjybU}o1s6iY29&dMi^W z&#X~zTPNbMOV0K>!>RCod$xeSswV;t8`Jw`m^IRDC!M{Z`JACEl)u)&yX?|C4y_SWRmrnMh^ERnXV$8b4NMClVkddZ1a9Q9QxhK193mgAzr0JhgRlHn>rUH N;OXk;vd$@?2>`^ndVc@_ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_done.png b/app/src/main/res/drawable-xxhdpi/ic_action_done.png deleted file mode 100644 index c329d01ea9743e8b65c984f685aae1462465d2d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U|j0y;uunK>+KywFK0)Q)Dg?N;bgG+a| zDjs;XQjl@hZa0>UcTz$NY)q9F>^~cu%=Bw}RaS(9{jA-p0vFys%R9+Zvfjp*b&u}M zhP<`&K0Pd-)cnN4(pzux>?ekm@l1kubKiYxHJkkRiH4=G-lW%06e~ULq$gjT|4c8w zNcU!(K{Z>L|JU==T{ow%*tvSHZ8Ue<`Q!4_)T1Bo7ud2d;oBZ9e-;f#uL4K9OPdOeMxy%b0*ziSd-rL8n^k PB}mlM)z4*}Q$iB}({aeS diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b7e16e7..1398e6d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -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"> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 1de207d..4acb6ab 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -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"/> - - - - - - - - - - + app:showAsAction="always"/> +