external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Achievements to its own screen

Browse Source
This commit is contained in:
drdev
2015-04-23 01:23:05 +00:00
parent 3b50dbc671
commit 0960bcca4c
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -1299,6 +1299,7 @@ forge-gui-mobile/src/forge/screens/LaunchScreen.java -text
forge-gui-mobile/src/forge/screens/LoadingOverlay.java -text
forge-gui-mobile/src/forge/screens/SplashScreen.java -text
forge-gui-mobile/src/forge/screens/TabPageScreen.java -text
forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java -text
forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java -text
forge-gui-mobile/src/forge/screens/constructed/ConstructedScreen.java -text
forge-gui-mobile/src/forge/screens/gauntlet/LoadGauntletScreen.java -text
@@ -1356,7 +1357,6 @@ forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java -text
forge-gui-mobile/src/forge/screens/quest/QuestSpellShopScreen.java -text
forge-gui-mobile/src/forge/screens/quest/QuestStatsScreen.java -text
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java -text
forge-gui-mobile/src/forge/screens/settings/AchievementsPage.java -text
forge-gui-mobile/src/forge/screens/settings/FilesPage.java -text
forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java -text
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java -text

23
forge-gui-mobile/src/forge/screens/settings/AchievementsPage.java → forge-gui-mobile/src/forge/screens/achievements/AchievementsScreen.java
View File

@@ -1,9 +1,10 @@
package forge.screens.settings;
package forge.screens.achievements;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment;
import com.badlogic.gdx.math.Rectangle;
import forge.Forge;
import forge.Graphics;
import forge.achievement.Achievement;
import forge.achievement.AchievementCollection;
@@ -17,7 +18,6 @@ import forge.card.CardZoom;
import forge.item.IPaperCard;
import forge.menu.FDropDown;
import forge.screens.FScreen;
import forge.screens.TabPageScreen.TabPage;
import forge.toolbox.FComboBox;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;
@@ -25,7 +25,7 @@ import forge.toolbox.FScrollPane;
import forge.toolbox.FEvent.FEventHandler;
import forge.util.Utils;
public class AchievementsPage extends TabPage<SettingsScreen> {
public class AchievementsScreen extends FScreen {
private static final float TROPHY_PADDING = 45;
private static final float PADDING = Utils.scale(5);
private static final float SELECTED_BORDER_THICKNESS = Utils.scale(1);
@@ -36,11 +36,20 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
private static final FSkinColor TEXT_COLOR = FLabel.DEFAULT_TEXT_COLOR;
private static final FSkinColor NOT_EARNED_COLOR = TEXT_COLOR.alphaColor(0.5f);
private static AchievementsScreen achievementsScreen; //keep settings screen around so scroll positions maintained
public static void show() {
if (achievementsScreen == null) {
achievementsScreen = new AchievementsScreen();
}
Forge.openScreen(achievementsScreen);
}
private final FComboBox<AchievementCollection> cbCollections = add(new FComboBox<AchievementCollection>());
private final TrophyCase trophyCase = add(new TrophyCase());
protected AchievementsPage() {
super("Achievements", FSkinImage.QUEST_BOX);
private AchievementsScreen() {
super("Achievements");
AchievementCollection.buildComboBox(cbCollections);
@@ -56,9 +65,9 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
}
@Override
protected void doLayout(float width, float height) {
protected void doLayout(float startY, float width, float height) {
float x = PADDING;
float y = PADDING;
float y = startY + PADDING;
width -= 2 * x;
cbCollections.setBounds(x, y, width, cbCollections.getHeight());

2
forge-gui-mobile/src/forge/screens/home/HomeScreen.java
View File

@@ -6,6 +6,7 @@ import forge.screens.FScreen;
import forge.assets.FSkinImage;
import forge.deck.FDeckChooser;
import forge.game.GameType;
import forge.screens.achievements.AchievementsScreen;
import forge.screens.settings.SettingsScreen;
import forge.toolbox.FButton;
import forge.toolbox.FEvent;
@@ -49,6 +50,7 @@ public class HomeScreen extends FScreen {
addButton("Achievements", new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
AchievementsScreen.show();
}
});
addButton("Settings", new FEventHandler() {

1
forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java
View File

@@ -27,7 +27,6 @@ public class SettingsScreen extends TabPageScreen<SettingsScreen> {
private SettingsScreen() {
super(new TabPage[] {
new SettingsPage(),
new AchievementsPage(),
new FilesPage()
});
}