From f05c11e673e9faa8b04f8a05d138d415991ce55c Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 16 Jul 2020 23:31:28 -0400 Subject: [PATCH] v0.8.2: Finalized layout and visuals for TitleScene.java --- core/src/main/assets/interfaces/icons.png | Bin 10549 -> 10666 bytes .../assets/messages/scenes/scenes.properties | 2 +- .../scenes/TitleScene.java | 118 ++++++++++++------ .../shatteredpixeldungeon/ui/Icons.java | 12 +- .../ui/StyledButton.java | 4 + 5 files changed, 91 insertions(+), 45 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index c0f143dbfaafd8b90fa52e4bb709baaac6c352f2..3085ebc9fe8116d52c18fd1b6d5a0fcd48293b5c 100644 GIT binary patch literal 10666 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 Qi2wiq07*qoM6N<$f{OHpbN~PV literal 10549 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 D>Jy3{ diff --git a/core/src/main/assets/messages/scenes/scenes.properties b/core/src/main/assets/messages/scenes/scenes.properties index 6cc589f9a..62cfccc64 100644 --- a/core/src/main/assets/messages/scenes/scenes.properties +++ b/core/src/main/assets/messages/scenes/scenes.properties @@ -70,7 +70,7 @@ scenes.titlescene.support=Support the Game scenes.titlescene$changesbutton.title=An Update is Available! scenes.titlescene$changesbutton.versioned_title=Update Available: %s scenes.titlescene$changesbutton.desc=Shattered Pixel Dungeon is regularly updated with overhauls to existing game content, or entirely new content!\n\nGame balance is also frequently improved in game updates, so that specific items/heroes/enemies aren't too strong or too weak.\n\nUpdates also include fixes for bugs and other various stability improvements. -scenes.titlescene$changesbutton.update=Get The Update +scenes.titlescene$changesbutton.update=Go to Update Page scenes.titlescene$changesbutton.changes=Current Changes Screen scenes.titlescene.patreon_body=Shattered Pixel Dungeon is a completely free game, which means that I depend on support from generous players in order to keep making it.\n\nIf you're interested in supporting me, the best way to do so is through Patreon. Patreon gives me a consistent income source, and allows me to give something back to those who support me!\n\nPatrons get exclusive blog posts every week which let them know about what I'm working on before anyone else!\n\nYou can take a look at my Patreon page for the most up to date information about benefits, Thank you for your consideration!\n\n(Patreon rewards are only available in English) scenes.titlescene.patreon_button=Patreon Page diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java index 9444f4972..73b7e7a35 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/TitleScene.java @@ -30,8 +30,10 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites; import com.shatteredpixel.shatteredpixeldungeon.effects.Fireball; import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; +import com.shatteredpixel.shatteredpixeldungeon.services.news.News; import com.shatteredpixel.shatteredpixeldungeon.services.updates.AvailableUpdateData; import com.shatteredpixel.shatteredpixeldungeon.services.updates.Updates; +import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; @@ -48,6 +50,8 @@ import com.watabou.noosa.audio.Music; import com.watabou.utils.ColorMath; import com.watabou.utils.DeviceCompat; +import java.util.Date; + public class TitleScene extends PixelScene { @Override @@ -99,7 +103,7 @@ public class TitleScene extends PixelScene { add( signs ); final Chrome.Type GREY_TR = Chrome.Type.GREY_BUTTON_TR; - + StyledButton btnPlay = new StyledButton(GREY_TR, Messages.get(this, "enter")){ @Override protected void onClick() { @@ -127,26 +131,7 @@ public class TitleScene extends PixelScene { btnPlay.icon(Icons.get(Icons.ENTER)); add(btnPlay); - //TODO turn this into its own class? - StyledButton btnSupport = new StyledButton(GREY_TR, Messages.get(this, "support")){ - @Override - protected void onClick() { - WndOptions wnd = new WndOptions(Messages.get(TitleScene.class, "support"), - Messages.get(TitleScene.class, "patreon_body"), - Messages.get(TitleScene.class, "patreon_button")){ - @Override - protected void onSelect(int index) { - if (index == 0){ - DeviceCompat.openURI("https://www.patreon.com/ShatteredPixel"); - } else { - hide(); - } - } - }; - parent.add(wnd); - } - }; - btnSupport.icon(Icons.get(Icons.GOLD)); + StyledButton btnSupport = new SupportButton(GREY_TR, Messages.get(this, "support")); add(btnSupport); StyledButton btnRankings = new StyledButton(GREY_TR,Messages.get(this, "rankings")){ @@ -167,15 +152,14 @@ public class TitleScene extends PixelScene { btnBadges.icon(Icons.get(Icons.BADGES)); add(btnBadges); - ChangesButton btnChanges = new ChangesButton(GREY_TR, Messages.get(this, "changes")); + StyledButton btnNews = new NewsButtons(GREY_TR, Messages.get(this, "news")); + btnNews.icon(Icons.get(Icons.NEWS)); + add(btnNews); + + StyledButton btnChanges = new ChangesButton(GREY_TR, Messages.get(this, "changes")); btnChanges.icon(Icons.get(Icons.CHANGES)); add(btnChanges); - //TODO news feed functionality here - StyledButton btnNews = new StyledButton(GREY_TR, Messages.get(this, "news")); - btnNews.icon(Icons.get(Icons.CHANGES)); - add(btnNews); - StyledButton btnSettings = new SettingsButton(GREY_TR, Messages.get(this, "settings")); add(btnSettings); @@ -206,13 +190,13 @@ public class TitleScene extends PixelScene { } else { btnPlay.setRect(title.x, topRegion+GAP, title.width(), BTN_HEIGHT); align(btnPlay); - btnRankings.setRect(btnPlay.left(), btnPlay.bottom()+ GAP, (btnPlay.width()/2)-1, BTN_HEIGHT); + btnSupport.setRect(btnPlay.left(), btnPlay.bottom()+ GAP, btnPlay.width(), BTN_HEIGHT); + btnRankings.setRect(btnPlay.left(), btnSupport.bottom()+ GAP, (btnPlay.width()/2)-1, BTN_HEIGHT); btnBadges.setRect(btnRankings.right()+2, btnRankings.top(), btnRankings.width(), BTN_HEIGHT); btnNews.setRect(btnRankings.left(), btnRankings.bottom()+ GAP, btnRankings.width(), BTN_HEIGHT); btnChanges.setRect(btnNews.right()+2, btnNews.top(), btnNews.width(), BTN_HEIGHT); btnSettings.setRect(btnNews.left(), btnNews.bottom()+GAP, btnRankings.width(), BTN_HEIGHT); btnAbout.setRect(btnSettings.right()+2, btnSettings.top(), btnSettings.width(), BTN_HEIGHT); - btnSupport.setRect(btnPlay.left(), btnAbout.bottom()+ GAP, btnPlay.width(), BTN_HEIGHT); } BitmapText version = new BitmapText( "v" + Game.version, pixelFont); @@ -221,8 +205,6 @@ public class TitleScene extends PixelScene { version.x = w - version.width() - 4; version.y = h - version.height() - 2; add( version ); - - int pos = 2; fadeIn(); } @@ -233,7 +215,41 @@ public class TitleScene extends PixelScene { add( fb ); } - //TODO change icon? + private static class NewsButtons extends StyledButton { + + public NewsButtons( Chrome.Type type, String label ){ + super(type, label); + if (SPDSettings.news()) News.checkForNews(); + } + + int unreadCount = -1; + + @Override + public void update() { + super.update(); + + if (unreadCount == -1 && News.articlesAvailable()){ + unreadCount = News.unreadArticles(new Date(SPDSettings.newsLastRead())); + if (unreadCount > 0){ + unreadCount = Math.min(unreadCount, 9); + text(text() + "(" + unreadCount + ")"); + } else { + SPDSettings.newsLastRead(Game.realTime); + } + } + + if (unreadCount > 0){ + textColor(ColorMath.interpolate( 0xFFFFFF, Window.SHPX_COLOR, 0.5f + (float)Math.sin(Game.timeTotal*5)/2f)); + } + } + + @Override + protected void onClick() { + super.onClick(); + //ShatteredPixelDungeon.switchNoFade( NewsScene.class ); + } + } + private static class ChangesButton extends StyledButton { public ChangesButton( Chrome.Type type, String label ){ @@ -252,7 +268,7 @@ public class TitleScene extends PixelScene { updateShown = true; text(Messages.get(TitleScene.class, "update")); } - textColor(ColorMath.interpolate( 0xFFFFFF, Window.SHPX_COLOR, 0.5f + (float)Math.sin(Game.timeTotal*4)/2f)); + textColor(ColorMath.interpolate( 0xFFFFFF, Window.SHPX_COLOR, 0.5f + (float)Math.sin(Game.timeTotal*5)/2f)); } } @@ -285,17 +301,13 @@ public class TitleScene extends PixelScene { } - //TODO maybe have this blink a bit differently than the language button used to private static class SettingsButton extends StyledButton { - boolean blinking; - public SettingsButton( Chrome.Type type, String label ){ super(type, label); if (Messages.lang().status() == Languages.Status.INCOMPLETE){ icon(Icons.get(Icons.LANGS)); icon.hardlight(1.5f, 0, 0); - blinking = true; } else { icon(Icons.get(Icons.PREFS)); } @@ -305,17 +317,43 @@ public class TitleScene extends PixelScene { public void update() { super.update(); - if (blinking){ - icon.am = (float)Math.abs(Math.cos( Game.timeTotal )); + if (Messages.lang().status() == Languages.Status.INCOMPLETE){ + textColor(ColorMath.interpolate( 0xFFFFFF, CharSprite.NEGATIVE, 0.5f + (float)Math.sin(Game.timeTotal*5)/2f)); } } @Override protected void onClick() { - if (blinking){ + if (Messages.lang().status() == Languages.Status.INCOMPLETE){ WndSettings.last_index = 4; } ShatteredPixelDungeon.scene().add(new WndSettings()); } } + + private static class SupportButton extends StyledButton{ + + public SupportButton( Chrome.Type type, String label ){ + super(type, label); + icon(Icons.get(Icons.GOLD)); + textColor(Window.TITLE_COLOR); + } + + @Override + protected void onClick() { + WndOptions wnd = new WndOptions(Messages.get(TitleScene.class, "support"), + Messages.get(TitleScene.class, "patreon_body"), + Messages.get(TitleScene.class, "patreon_button")){ + @Override + protected void onSelect(int index) { + if (index == 0){ + DeviceCompat.openURI("https://www.patreon.com/ShatteredPixel"); + } else { + hide(); + } + } + }; + parent.add(wnd); + } + } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index 2d20d2d55..c2775a2b3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -69,6 +69,7 @@ public enum Icons { GOLD, RANKINGS, BADGES, + NEWS, CHANGES, SHPX, @@ -193,14 +194,17 @@ public enum Icons { case BADGES: icon.frame( icon.texture.uvRect( 34, 64, 50, 80 ) ); break; + case NEWS: + icon.frame( icon.texture.uvRect( 51, 64, 67, 79 ) ); + break; case CHANGES: - icon.frame( icon.texture.uvRect( 51, 64, 68, 79 ) ); + icon.frame( icon.texture.uvRect( 68, 64, 83, 79 ) ); break; case SHPX: - icon.frame( icon.texture.uvRect( 68, 64, 84, 80 ) ); + icon.frame( icon.texture.uvRect( 85, 64, 101, 80 ) ); break; case GOLD: - icon.frame( icon.texture.uvRect( 85, 64, 102, 80 ) ); + icon.frame( icon.texture.uvRect( 102, 64, 119, 80 ) ); break; case LIBGDX: @@ -231,7 +235,7 @@ public enum Icons { icon.scale.set(PixelScene.align(0.49f)); break; case CUBE_CODE: - icon.frame( icon.texture.uvRect( 101, 39, 128, 69 ) ); + icon.frame( icon.texture.uvRect( 101, 32, 128, 62 ) ); icon.scale.set(PixelScene.align(0.49f)); break; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java index d19cd3693..aee13a7b6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StyledButton.java @@ -104,6 +104,10 @@ public class StyledButton extends Button { text.text( value ); layout(); } + + public String text(){ + return text.text(); + } public void textColor( int value ) { text.hardlight( value );