v0.3.1: added a button to allow re-checking of changes

This commit is contained in:
Evan Debenham 2015-06-28 21:47:56 -04:00 committed by Evan Debenham
parent f1bece816f
commit dae5aca01b
4 changed files with 86 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -24,6 +24,7 @@ import javax.microedition.khronos.opengles.GL10;
import android.opengl.GLES20; import android.opengl.GLES20;
import com.shatteredpixel.shatteredpixeldungeon.ui.ChangesButton;
import com.watabou.noosa.BitmapText; import com.watabou.noosa.BitmapText;
import com.watabou.noosa.Camera; import com.watabou.noosa.Camera;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
@ -149,21 +150,17 @@ public class TitleScene extends PixelScene {
btnHighscores.setPos( w / 2, btnPlay.top() ); 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 ); BitmapText version = new BitmapText( "v " + Game.version + "", font1x );
version.measure(); version.measure();
version.hardlight( 0xCCCCCC ); version.hardlight( 0xCCCCCC );
version.x = w - version.width(); version.x = w - version.width();
version.y = h - version.height() - source.height(); version.y = h - version.height();
add( version ); add( version );
Button changes = new ChangesButton();
changes.setPos( w-changes.width(), h - version.height() - changes.height());
add( changes );
PrefsButton btnPrefs = new PrefsButton(); PrefsButton btnPrefs = new PrefsButton();
btnPrefs.setPos( 0, 0 ); btnPrefs.setPos( 0, 0 );
add( btnPrefs ); add( btnPrefs );

View File

@ -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);
}
}

View File

@ -53,6 +53,7 @@ public enum Icons {
CHECKED, CHECKED,
UNCHECKED, UNCHECKED,
EXIT, EXIT,
NOTES,
CHALLENGE_OFF, CHALLENGE_OFF,
CHALLENGE_ON, CHALLENGE_ON,
RESUME; RESUME;
@ -145,6 +146,9 @@ public enum Icons {
case EXIT: case EXIT:
icon.frame( icon.texture.uvRect( 108, 0, 124, 16 ) ); icon.frame( icon.texture.uvRect( 108, 0, 124, 16 ) );
break; break;
case NOTES:
icon.frame( icon.texture.uvRect( 79, 40, 94, 56 ) );
break;
case CHALLENGE_OFF: case CHALLENGE_OFF:
icon.frame( icon.texture.uvRect( 78, 16, 102, 40 ) ); icon.frame( icon.texture.uvRect( 78, 16, 102, 40 ) );
break; break;