From 06673bdcd0eb324660e78c7c8b00c0079244a2d1 Mon Sep 17 00:00:00 2001
From: Carlos Galindo <carlos.s.galindo@gmail.com>
Date: Wed, 4 Mar 2015 23:51:47 +0100
Subject: [PATCH] Imrpoved undo

---
 app/app.iml                                   |  19 ++++++++--------
 app/build.gradle                              |   1 +
 .../kauron/dungeonmanager/Introduction.java   |   1 +
 .../kauron/dungeonmanager/MainActivity.java   |  21 ++++++++++--------
 .../com/kauron/dungeonmanager/Player.java     |   2 +-
 .../main/res/drawable-hdpi/ic_action_edit.png | Bin 383 -> 0 bytes
 .../main/res/drawable-hdpi/ic_action_name.png | Bin 798 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_edit.png | Bin 269 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_name.png | Bin 490 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_edit.png     | Bin 475 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_name.png     | Bin 1061 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_edit.png    | Bin 678 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_name.png    | Bin 1692 -> 0 bytes
 app/src/main/res/layout/activity_welcome.xml  |  12 +++++-----
 app/src/main/res/menu/menu_main.xml           |   4 ++--
 build.gradle                                  |   2 +-
 16 files changed, 35 insertions(+), 27 deletions(-)
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_edit.png
 delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_name.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_edit.png
 delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_name.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_edit.png
 delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_name.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_edit.png
 delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_name.png

diff --git a/app/app.iml b/app/app.iml
index e8f6572..21fada5 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <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="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="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <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 />
     <content url="file://$MODULE_DIR$">
       <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/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/source/r/test/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/buildConfig/test/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/res/rs/test/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/source/r/androidTest/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/androidTest/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/androidTest/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/resources" 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="support-v4-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>
 </module>
 
diff --git a/app/build.gradle b/app/build.gradle
index 622ec8a..21a7ee6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,4 +23,5 @@ android {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:21.0.3'
+    compile 'com.android.support:cardview-v7:21.0.3'
 }
diff --git a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
index aebd5a0..363c7bc 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Introduction.java
@@ -64,6 +64,7 @@ public class Introduction extends ActionBarActivity {
 
     @Override
     public void onBackPressed() {
+        super.onBackPressed();
         Toast.makeText(
                 getApplicationContext(),
                 R.string.message_no_back_button_intro,
diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
index 24a2a28..8622e67 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java
@@ -57,7 +57,6 @@ public class MainActivity extends ActionBarActivity{
                         .setColorFilter(Color.parseColor("#62BACE"), PorterDuff.Mode.SRC_IN);
         curativeEffortsBar.getProgressDrawable()
                         .setColorFilter(Color.parseColor("#FFD700"), PorterDuff.Mode.SRC_IN);
-        //TODO: use the negative PG bar, not curativeEfforts one
         undo = false;
         //begin
         restoreData();
@@ -77,7 +76,11 @@ public class MainActivity extends ActionBarActivity{
 
     @Override
     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;
     }
 
@@ -120,7 +123,6 @@ public class MainActivity extends ActionBarActivity{
                             //levelUp
                             //TODO: update defenses
                             //TODO: add attack points when necessary
-                            //TODO: update currentPg button
                             //TODO: improve leveling up
                             player.setMaxPgOnLevelUp();
                             lvl.setText(
@@ -496,11 +498,13 @@ public class MainActivity extends ActionBarActivity{
             undoObject = NULL;
             message = getString(R.string.action_undo_current_pg);
         }
-        Toast.makeText(
-                getApplicationContext(),
-                message,
-                Toast.LENGTH_LONG
-        ).show();
+        if (!message.isEmpty()) {
+            Toast.makeText(
+                    getApplicationContext(),
+                    message,
+                    Toast.LENGTH_LONG
+            ).show();
+        }
         pgUpdate();
         undo = false;
         invalidateOptionsMenu();
@@ -599,7 +603,6 @@ public class MainActivity extends ActionBarActivity{
     }
 
 
-    //TODO: show on screen the max pg's
 //                    if(progressBar.getId() == R.id.pgBar) {
 //                        double rate = (double)current / progressBar.getMax() * (negative ? -1:1);
 //                        if (rate <= 0) {
diff --git a/app/src/main/java/com/kauron/dungeonmanager/Player.java b/app/src/main/java/com/kauron/dungeonmanager/Player.java
index 4dafd5a..27508ae 100644
--- a/app/src/main/java/com/kauron/dungeonmanager/Player.java
+++ b/app/src/main/java/com/kauron/dungeonmanager/Player.java
@@ -217,7 +217,7 @@ public class Player {
     public void setRaceInt(int raceInt) {this.raceInt= 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) {
         if(isLong) {
             pg = maxPg;
diff --git a/app/src/main/res/drawable-hdpi/ic_action_edit.png b/app/src/main/res/drawable-hdpi/ic_action_edit.png
deleted file mode 100644
index 7801abc8e4ff30fa76ca415ebd9c72383b7ca1c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0003-Nkl<Zc-rlk
z+iJo<6h(dX6Ix$dE4`pLrPx*~wTPmK^c#H42Np{2wc48%|0(W)JV=P~3{A=&JR8<q
z2G%BLCYfALqtR$I8qJ0#2!d@e1VtC+cfdWEgAu5>DnECs1SIp|E+X$-i2;};lqj-F
z4}>L#Z1Vk3b|xtCWKJh0`5yRP5=<&F0c9rnZbUw*#5ZU#$#=kX#f-<5*kY1zuaRFa
z(Pi7PE$}0dH$0e+8k79Bh5RGfWs+}N$eW{bk4gS2JVl(8Z&=7bgA$YcrG@+p*k_Wj
zgD;`{D>z`1zp#`)WRgDzpF;UJaKt2k20kq0sea5n3;7Y1d|1F2%D;mu<BdvEU<{5~
z@3Fo>-ixd$gzNr7?LP{bo772+{H<{8lJK)GVB}9Tl25fjZN)40VxGN8VRX_RA&o|(
d(P%UoWC8qmQ#IlSx;Ov;002ovPDHLkV1kD}rm_G4

diff --git a/app/src/main/res/drawable-hdpi/ic_action_name.png b/app/src/main/res/drawable-hdpi/ic_action_name.png
deleted file mode 100644
index c4a7262ec9ccd6004df58bb39f5a2087947c356e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 798
zcmV+(1L6FMP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0008zNkl<Zc-rlm
zTWb?R6vvxbDPm)>HL*>!zWLCHegv^atG)Rk(t0BgV%4_bhY(GTSTBuLUwgB$iZ`(0
zB|&Rd#C)gtKkzRs%WihFGrOC>4*Ur0%(>0ZoSivoX^C3Yq87ELZ`Eow29AO($b)t8
z8I<|^g3q%Y7i$#9+rT7v4Jrn<z&lXn@0O|m6_^nDFlT%ie4<0YL5|P5LEJPx&gUaw
zj^itoKOMC5`@jRkOy2+<b?WE<(}p*5A0&csJ`LW`=z`3uqP`wbpgz%?_S^YQ@DE%w
zFB1j5alS<f;-l)M*coZ(#uFnGK26Yh>fZo+bt}(N`Lx5h6zHo#%0YgHc5dr*{y3FB
zby_y)e_~3PW)@s5r{^4dOo#KW;63=|W`i-vS^+G&(2-%9mG8$c)d0q5c-G~3<p8MX
zCdZGc2C%}}=nOc3F4|pIalV&E^L5B*34prpQRc8}S{t(HOM(*?6deLsw~<R)*cety
z+lJJ6z@jhf;Ap*EvPsF_Qz~cct4*Ko0503uDaldXYXD`tO%z}Nl0?3F4dAbA%8&z)
zkJ_JR4&a$e0J4OZLJnYAWeF9VeG~7b(XNovXp((*yasTg#)s@6KQv}G92|XVBbTzU
zaf&jNUIREn1#=-CCGwQ%RXGo>@hH7N;KN)e4|6N3r_nPsJQHvLvm8IB8o+Mw0c^Xu
zY-_sEr1{pxZmW)4*&vM<TwEy^9Reu0xKi%u7|?kyzDuQ3F6un}HRy4WzfL<j-BpPM
z3r|uLI_pze<s9`(oweN$0~yvb#mE(16=p7*tJJ&ccXjR%s}vR1N0W;B<kIqp`lJex
z38FqKh1th6`kk|v@USGOzz^zqC`IF-%j@Id3my0gZh@0L!^AAc%kv?Q+oqhzkB0V#
z2Mq6#gBV}GF<q9q8CUsRHub*+7e&5N{;7$v_9>fto`v8N>;EMl^5)s!*D!xEMJ;Mk
ci<)x#4}XWNCqlDQcK`qY07*qoM6N<$f~sqLj{pDw

diff --git a/app/src/main/res/drawable-mdpi/ic_action_edit.png b/app/src/main/res/drawable-mdpi/ic_action_edit.png
deleted file mode 100644
index 90bbb5060b5e8954ab1b3df13946f08a8d89e31d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmV+o0rLKdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80002gNkl<Zc-rlh
zK?=e!5Jjs;5|t{VC>F7zP!Hh|y6|q@Xw_PKr#J%<hG5cGoCq=>9t2wQegcyqkVqu|
z7Nt}V$bb~+{6c;LD$UVr36LeggA_ngAL2bi*0e<C<J6^=nk5P#<dpBU{B>HhM9eAQ
z8gg19;lB2bMUI?t8aU;#L!JYDPWie<KH!wE9P$e=<djFi-6FqokJ_?EKH`)w^kZU^
zkGaRqC7<|s<KM||z?A&cZOS(apnOKYAM|82p=e#gkmCk(LteF@{OA@W5(#&nCKPgQ
TwWRrs00000NkvXXu0mjf#Km*4

diff --git a/app/src/main/res/drawable-mdpi/ic_action_name.png b/app/src/main/res/drawable-mdpi/ic_action_name.png
deleted file mode 100644
index b091366c495e9c7f47a37382894d719aae2f6ab4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800058Nkl<Zc-rlk
zOG`pQ6vt~L(Mp7Dcdb?>Xxf9QuTe?0kY4L33wnHlqLNldAyN>wZ(%QS5!nO!PWC_W
zUkq_a@7z1m<_`QAojGUD-+Rx@9D91g7B+*{YPFJJ3sk@hcw=ATc(Pl8N5M7t0H+`a
zW<ZL4j^i?aCH6Lh=eckJ#5&l<z%K3cHi8%Uh{p~6GW6RC5_}1~f`m{11pRY<oQJ?W
znA9ZVoeN_wwo_auVJhGp9BSs~z>f>F8v7$~W)j?C62&bE80316R{<NK*k;~H0DUgN
zx>o@uHF5Ac0v<q()HMR?ijCMulr`j>D0vm|1hUHaeoeqm^eJmhfJd(azSQ?+Nq}t0
zPp<;L|672(f{bMWS(8_A2^Rk(VU5Csh9+P`v8e?~!p$yh!=h|&lQUcnjsZ&tQQYVt
zQWWo75^&J&iRuK5@Dj;tE~6^ASE#yGL)`ze&aj^wafNrf<MTRp=)WAKCfH+Erw#qm
z;907ppcPRsSYr}xgJ=i)s8m6;U$tEgmq8O8gLyE`ap@Pp3Fph*td3Lsg}1!@n(S{l
go(liGgw3@50@6$n$c4^lumAu607*qoM6N<$f?UnrP5=M^

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_edit.png b/app/src/main/res/drawable-xhdpi/ic_action_edit.png
deleted file mode 100644
index b64a5bc1c269c98797a51cf899d30f4ee886dae2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004^Nkl<Zc-rll
zSxUoT7)AR~7vMY>CqyhNDk`-o>SA0)SKtD=1m}64r)t}W?kV0MB9uVV^oz0il6&C1
z7S3(LpCpwcgb+dqA%qY@B8g>L?XU>TumIbV7QY8;b?zi$1Ur7$5nn$-I%)rWEiqRD
z!g8?EV1U?<um!6=MkvH3c+*4+MkvQ2e#5@xD=s5=-3~?V@#~JjY7<w&Iqc9Jzh*z+
zIK%vm@CY-S<MS@@zk1ycpD?RAezie-qbnh={fze$?>d6!_!aowM11}2kkcN&48H{N
z#(nd6tT}!uK>UIBqizwFgz<;k;}`5BOA>zsJ2l782Z%q0U7F+P0>q!dZq4zt@Ix4X
z3VSri&%k$K{F(OnY=C(4R@bXJej2_B<1b*J_V`y}{3Yzy96uEx{t6Cgj-P}t!uV@A
zs6GB!7=HtYw7=Os3FB|!a2($2rSX|m91z6c#U@@bz&#vs`JHqaMrnWtIO_5n+xGXq
zzqS<m2tMP@cl$Aq_*zI-qcDJpA8$c?BnB`?<V1_&|7QR~2qA<JLI@#>`2oD<{*2Kp
RBVhml002ovPDHLkV1oW`+Fbwu

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_name.png b/app/src/main/res/drawable-xhdpi/ic_action_name.png
deleted file mode 100644
index 655739732cff4d21ebf9a55d497b1c64d3a88cd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1061
zcmV+=1ls$FP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000B*Nkl<Zc-rk+
z>q}HY6u*8cTgf*)q$ia|L_rvY^d{(`NcAO<RM@t65T<RuDire%5HmlNmX>CT+B@8m
zva(G7Cp!bb3x`YY?yNKSp>yEJvb!^9=KSv5nKS1c%Q9lbh!G=3j2O`<b8~YAgi=Bs
zp@T3)_(&MX=Ma9cMZ1E<VDu`&1;Q)B3}IFRGaw}_^aRcD^@Mwb-wvbx5C#bCglmLq
z!a00i$L|AZ$NLFA&4hJ+H$0ti!(sSOLL1=_Au~xmnS{fH2ZUct*A$3L_oMOK38QSX
zU$OjGE>N!^BSM&9x<?2_elorsPe)AdFX7HY4WEaI2I!x~$|&=L@zrdD6TA5y&Epjl
zJ~6VZyf)rmmQM+JE{&T{=woA7dSU!2wj8?%A(zJw5xUt*IN|2tTiNd1=eF?<68hO`
zv&D@;m&38K-}yX=$wqOWCqgt?Qt>)`#(Z89mgy!S!j|1$iGGEWp5QhK-TT<<7}jb0
z8Z0$2P=jP&Z3IAn6Z-wo<~n0(+D=ZE&j`q2&Qh%o<8#>4znDUQtps3<%WM^7t0th5
zDbMmL0om*!Rj4N5ITW|0*k3yV7^mGno>kxLZFhIS&j~ol;tBaGy*~Ro8j91dp3plF
z1|<m?jH4?WXAT)Go^V_h0d-K=lc3#ONh4FmSb}*xL%Un52<U>srhpJ|7wtM#5ipv}
zt;<IQ*tgUXRRny4!m@x6P>yyJstA~d!lMBp;F!H>t0v&cQYGL!6qYX4S6~bZ&j*Bn
zD%G3dBPeVP2m#G#_fYjU_(?zr=v8_xcDTYT5;!0)=E1O}k;8FxH6{qX*_o-6st8!k
zE<+_gzYHB<mmzhLAtWt@;#Qv%(1!l~s^bCn&N`WFlGB5LNG1X{2~Vt42*_o*fUr*q
zh_D<%u8z21JqC!$t^yZ=qT=a)LEosZsBi&W1-E@hKs|f<Yjx%Z?8xi1OeR=!Vx*WQ
zMlR{j45hO({k;g6C)qCp$&1z`&?J!>%SDP#%;&X8-MNt;EMf%_JzkZp2&W8bdAneu
z(9OZinRC<;&qLH`d?#~y%Di|25%$hLR-TQCpQY+yV}~t|mS7r4uvfx6!Y<8Y?k0R-
zPhQj!rdeJJP2eos6GTkDMs?8yHqlxZof6}nvHT)5nVpX7@Hp~`p#|y<!3`g0y5A6X
zSbh^sw#HHEIf<&#5{aWNg!cE*pI4gR^r|FBhKS8L&!-*E%@ndWEy7_D8C<+R75LtQ
znxm=zl-LS=o2(!ST<5E(>`bLtTJ*cJSSrUiicJgEp4~7mhNMdj-@EbuX~G7}h!G=3
fj2JOuM6>(@|CeU62%I}900000NkvXXu0mjf5)15{

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_edit.png b/app/src/main/res/drawable-xxhdpi/ic_action_edit.png
deleted file mode 100644
index 37214781c902d04e14f70acde5690a63b7beb830..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 678
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V9ND$aSW-r_4anOcSxYbu|h*@
z`IS1>vqVLe)asP;|L~Xvxdeu|ESxy$V&jS6)`@8|)0T-BU#?mH@}_|kNA_FW>T9=e
z@%^{Axqj&V+-}Pq(NP^}z$t8PSoBuL+{ozbUbo^>{>lI2UArk&_?BJEqX+r#Slu@q
zmH+ghxP=Ld53s+uVpb&6pv+?9RL|@_<AHA0ALS_mYxsBBe-OMjaqauieS$wYPQO_8
z`1{p;VK-d3D_a;_{{FbW{Xx6Up}SAk>YU2^6ZdvI`-X|iHrLA*zB%^(;x(f^U7uwV
zgRC1iN$<B-uA8TPCi|_%?~nCQE39We<<P#xI_2(<>qU>!ZJqRix>w)IV*atxUBUdH
z=-YILn!X9b^{NX0_Pf7uxzS(0^V{RfqY0{ZDL+5zOFrUnet&%bioXVj_H*u&-|ro5
zbZ9^8K6(3}oF8`!{>%OF_s8?C`EEbT5A?U64?m^(<M|d><v-Q8_<+`>Z(Z;9<NLwy
zkLO<$>-iv`k*l%$qyP1N<=YR`uXyWnv$x*scT&rLjvD*AcEx|mb%(z`o`1zo`k_7J
z{r-BV*~W+Jx$12G2m)<*drMvUPau$Sd~3hkkMmpZ0uAcVl<)a4`G3Ui=1tQ7SD0nD
z*dJpSe)+@L?Z@K>%jFYpam;_d)ky9D)BNQ(l;s|%{`koEf$L8Nd&Szf?k49L@1;~)
zDE$<XsXklLu>ICSp8E6vZTEXo5Bn}C{Ih-=;P%IhF)VKx^OffR?aVE<2ddwGFgu(-
zi&@2AS?*@r58uLul~y0LSz~72S4K+-TsPw1%vxyw-70h<F#R!jy85}Sb4q9e00(VV
Ad;kCd

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_name.png b/app/src/main/res/drawable-xxhdpi/ic_action_name.png
deleted file mode 100644
index daded342815a7ab29857bbe8979a9e64479fa5e8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1692
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

diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 498e3fe..f5586b9 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -1,6 +1,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
@@ -22,11 +24,11 @@
         android:onClick="onNewClick" />
 
     <Button
-        android:layout_width="match_parent"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/load_character"
         android:id="@+id/loadCharacter"
-        android:onClick="onLoadClick"
-        android:layout_marginTop="10dp" />
+        android:onClick="onLoadClick" />
+
 
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 5ea77ce..6a9acbb 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,12 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
-    <!--TODO: create fancy responsive toasts-->
+    <!--TODO: create fancy responsive toasts for undo's-->
     <item
         android:id="@+id/action_undo"
         android:title="@string/action_undo"
         android:orderInCategory="1"
-        app:showAsAction="never"
+        app:showAsAction="ifRoom"
         android:icon="@drawable/ic_action_undo"/>
     <item
         android:id="@+id/action_cure"
diff --git a/build.gradle b/build.gradle
index 6356aab..d3ff69d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     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
         // in the individual module build.gradle files