From dae5aca01b47af1e99922703df1e48a46546deb5 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Sun, 28 Jun 2015 21:47:56 -0400
Subject: [PATCH] v0.3.1: added a button to allow re-checking of changes

---
 assets/icons.png                              | Bin 2228 -> 2102 bytes
 .../scenes/TitleScene.java                    |  23 +++---
 .../ui/ChangesButton.java                     |  72 ++++++++++++++++++
 .../shatteredpixeldungeon/ui/Icons.java       |   4 +
 4 files changed, 86 insertions(+), 13 deletions(-)
 create mode 100644 src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java

diff --git a/assets/icons.png b/assets/icons.png
index c4057f0d939fd6179c33aec16363b9dfe8c4f13e..b134ae1f0df88c9b1ab568c8c0bbe3a97b0d76cf 100644
GIT binary patch
delta 1659
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
FV1hZ41V;b>

delta 1788
zcmV<Y1_SxF5VR4HBa_|%9TWos7B@8<3Juf%00Ed#OjJbx006Nml>vVhzcE4p000kk
zQchC<8ck+qfSH-2va++~<^0;)dE)>800Cl4M?{DF*$c}600xIiL_t(&-p!edLlZ|3
z#y6}5dG(r9Y^_kLc#8EEOiH4lfoc>mmD;EjD8w3Dq0v5sR&3L1QsMsX&dlE4?cMH$
za8lb(67GhW?|0wK?h$`wjFT8+eSQ7?@GYT;>9SnW$<d?Y!B{i+s!7H!U2>0S-~aF<
z7A?*l5D@esKtK4O@?;>e?mj2owb;@_(!>N1)Sm_j29n8aHtQlxwI(2cAm|eS{fSc_
zcseWq%H^QHWf8$cAE5rUzWTj)^^?|n$s`-hKFSio)bA|`xC4I(JPh#Sg$GdXDZ`fp
zcrF2+TT4O!@C^J{U4qHUfq?;P&|vmA0vL0C@(9XOdID&U5E?*FxmYas7yxdO|1C`5
z*;lJgL4fw4q#$@C2>$q15=i5+J_A7jzXj!T(R~U7Oe`(^fC1nPeCiT_f3q$DfIu{1
z>}S~p-?*&y0KR`1697yAIL__>XV0EJ4-W!B0%$`M0P0B(z$cJhPyot)1nx3K0Hy)3
zZfse%+5#b*f%7y2^b;Uht+N5Q11<m(WW6rT3IKf$4yZ$^0Th9tyXX=JW<baV0D?MW
zNn!5+0Kp&=U6`7k3M5eU{VNAr0RTc#V276BL=b>I!>50wkpF&z?)R~=sX*rg{wje1
zfMV<JCT3+Lilee-PuH&!7&amS&?7<%Y{h$4QA(*D2u?vFaoCfx6&J-qkk(gysmIGP
zm^w+yQN+ziKwE2TApllWkK+Km26ZY&iB`8mYi)rtxO(*+SGAgY91B2A;B{vras8gu
zbsb<~4G@0_U>nug7l6P?;<J0c5-gX?L7g6W1PQE7Lk0-oIE}_eG(e?dHVoGd0L^B-
z-o!ruz;b7DU!&kVC9p8PFg;BGjYcbg%G{ihK&!j?dncg;Sng&?=%xUeM(qwznak%*
z1X1-)kAnc<>YH@|z)IJ0xzBUCYbA9T*bM-Djvaq9I7QWQ1*iZ@0;N*Ug7#avQb~C|
zm^L<0W&rd#aYA>Bs<!}u>~lgTm7w)9Bp=(>oTBPl3$6<RK&eoG7C`3E0yy*mSk04q
ztomq9=DI$F!F`}m!XW_vQb8rIDW<g`faeo(im2<$@E1?tAwa=h1%*O;8w>eVDzMyO
z;1z!-syo{_yBixy-2m{X6av6TaHdcwoS|)CZ~nOAJSVDeJ7Vo@G<<@+ZN+W++Y-Q*
z83=!S+Xb-w4EA<2YRliQ*tP($?L71wilV-4+XBG0H$>fZJANa%gEmJIU;wrXU^gfN
z48ZmP+EWKgFN<HNRY9&U0S1uweB62iBZz<W=fU^m{&`2o>C>k}1oY#_VF2j_40*BO
zTpzEF4T$o0e&y=v=;$by{v)6u0e+%-tR>((5rE<&>jV(xe?<itbuJ%r0mvT+g0H`S
zUk|`@q80>vM4eg??a$Q!E?Yi8Z*Ol90Q|3<Gy({x3T;CHAF4lu4-)P9J3n5Lg${r8
z2ZD}}KQ{x&v^AfII*yv*`aeG8&tM1u#}EBEHv<SK!*v?#oIl_Z{{A8y8R_+h5I@nA
zfAq3NC(}AN)%nbfF@NQ}gCdXsZTORuai1~NIUk>CdHtawbp0Rm)>~J8&b-eV>PXPi
zpJ4}l0O7wI0L$mwtaJXw#qk+`p2C0mhldbH5B+xoXj|Zal8--l-~oiM->?ey)1UE+
zxSq!S1T=pHfP0Y&u#f)Y7No3b!|JA6p>jXu`|1BbllWIlJo+28*T0^L<N2=lJM}X7
zZ;`-%XXoY19haaB75N5fPnm;p2x`kx^UT>wrBVQ}NdT`rfZMk}X#sE!6yJXz09Mw)
zeSL)hwr-?uq*9wAfB=9RLSRtS<ey1rVgs!IwT_Q(D1jSWTd6Gq*a-lrA;4a>=o1hC
zm>)ctNyh^~cko}iBU%6%Ab{`h0mu;e;^LyE0*L%G>9_!N{VR|F6EnC8055d_83F`g
zS&kP$S`I)u{bmWk3^2Ay3ax)a1pqVP&Xa1j>Tq=xPy^1z1VDG3gLzT7puME)$dMzG
z0Rf&=Ij=tP0W!irHoywzzfLV6fME^b`0)S$m?MM)!1j}WT!3Zp$EQ0IVAud4Lm+^v
z<5U#@as6=tmcN{zzcW9NPogk9JUpZU9G4*=01$w`1VDRC;9N`qRTo(B>W4J~7l1<O
zV#<HAkZAp7#Af`a0Ax)7Lpp#6p=)1mKv5b3MJ6CZ=wko6qGmwoEdUIK{l)EA>MZ~a
evHw<Y*Z&`0#@NDSuG<p;0000<MNUMnLSTZBq$JP)

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java
index c8bd0fc9c..f5eaa29e1 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java
@@ -24,6 +24,7 @@ import javax.microedition.khronos.opengles.GL10;
 
 import android.opengl.GLES20;
 
+import com.shatteredpixel.shatteredpixeldungeon.ui.ChangesButton;
 import com.watabou.noosa.BitmapText;
 import com.watabou.noosa.Camera;
 import com.watabou.noosa.Game;
@@ -83,8 +84,8 @@ public class TitleScene extends PixelScene {
 		title.x = (w - title.width()) / 2;
 		title.y = (h - height) / 2;
 		
-		placeTorch( title.x + 18, title.y + 20 );
-		placeTorch( title.x + title.width - 18, title.y + 20 );
+		placeTorch(title.x + 18, title.y + 20);
+		placeTorch(title.x + title.width - 18, title.y + 20);
 
 		Image signs = new Image( BannerSprites.get( BannerSprites.Type.PIXEL_DUNGEON_SIGNS ) ) {
 			private float time = 0;
@@ -97,7 +98,7 @@ public class TitleScene extends PixelScene {
 			public void draw() {
 				GLES20.glBlendFunc( GL10.GL_SRC_ALPHA, GL10.GL_ONE );
 				super.draw();
-				GLES20.glBlendFunc( GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA );
+				GLES20.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
 			}
 		};
 		signs.x = title.x;
@@ -110,7 +111,7 @@ public class TitleScene extends PixelScene {
 				ShatteredPixelDungeon.switchNoFade( BadgesScene.class );
 			}
 		};
-		add( btnBadges );
+		add(btnBadges);
 		
 		DashboardItem btnAbout = new DashboardItem( TXT_ABOUT, 1 ) {
 			@Override
@@ -149,20 +150,16 @@ public class TitleScene extends PixelScene {
 			btnHighscores.setPos( w / 2, btnPlay.top() );
 		}
 
-		BitmapText source = new BitmapText( "PD v 1.7.5", font1x );
-		source.measure();
-		source.hardlight( 0x444444 );
-		source.x = w - source.width();
-		source.y = h - source.height();
-		add( source );
-
 		BitmapText version = new BitmapText( "v " + Game.version + "", font1x );
 		version.measure();
 		version.hardlight( 0xCCCCCC );
 		version.x = w - version.width();
-		version.y = h - version.height() - source.height();
-
+		version.y = h - version.height();
 		add( version );
+
+		Button changes = new ChangesButton();
+		changes.setPos( w-changes.width(), h - version.height() - changes.height());
+		add( changes );
 		
 		PrefsButton btnPrefs = new PrefsButton();
 		btnPrefs.setPos( 0, 0 );
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java
new file mode 100644
index 000000000..683a944a5
--- /dev/null
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/ChangesButton.java
@@ -0,0 +1,72 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2015 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.ui;
+
+import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.WelcomeScene;
+import com.watabou.noosa.Image;
+import com.watabou.noosa.audio.Sample;
+import com.watabou.noosa.ui.Button;
+
+public class ChangesButton extends Button {
+
+	protected Image image;
+
+	public ChangesButton() {
+		super();
+
+		width = image.width;
+		height = image.height;
+	}
+
+	@Override
+	protected void createChildren() {
+		super.createChildren();
+
+		image = Icons.NOTES.get();
+		add( image );
+	}
+
+	@Override
+	protected void layout() {
+		super.layout();
+
+		image.x = x;
+		image.y = y;
+	}
+
+	@Override
+	protected void onTouchDown() {
+		image.brightness( 1.5f );
+		Sample.INSTANCE.play( Assets.SND_CLICK );
+	}
+
+	@Override
+	protected void onTouchUp() {
+		image.resetColor();
+	}
+
+	@Override
+	protected void onClick() {
+		ShatteredPixelDungeon.switchNoFade(WelcomeScene.class);
+	}
+}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
index 5e6c41fb2..a58deb0d9 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java
@@ -53,6 +53,7 @@ public enum Icons {
 	CHECKED,
 	UNCHECKED,
 	EXIT,
+	NOTES,
 	CHALLENGE_OFF,
 	CHALLENGE_ON,
 	RESUME;
@@ -145,6 +146,9 @@ public enum Icons {
 		case EXIT:
 			icon.frame( icon.texture.uvRect( 108, 0, 124, 16 ) );
 			break;
+		case NOTES:
+			icon.frame( icon.texture.uvRect( 79, 40, 94, 56 ) );
+			break;
 		case CHALLENGE_OFF:
 			icon.frame( icon.texture.uvRect( 78, 16, 102, 40 ) );
 			break;