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

Merge branch 'master' into 'master'

Browse Source 
[Mobile] Fix annoying overlay between Quest Commander matches

See merge request core-developers/forge!3494
This commit is contained in:
Anthony Calosa
2020-12-07 04:16:16 +00:00
parent 8076682d1b ff7638e2fc
commit 28dbf55c82
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui-mobile/src/forge/screens/match/winlose/QuestWinLose.java
View File

@@ -18,6 +18,7 @@ package forge.screens.match.winlose;
import forge.game.GameView;
import forge.quest.QuestWinLoseController;
import forge.screens.home.HomeScreen;
/**
* <p>
@@ -44,6 +45,10 @@ public class QuestWinLose extends ControlWinLose {
@Override
public final void showRewards() {
//set loading overlay again
if (HomeScreen.instance.getQuestWorld().contains("XandomX")) {
HomeScreen.instance.updateQuestWorld(HomeScreen.instance.getQuestWorld().replace("XandomX","Random"));
}
controller.showRewards();
}
@@ -60,4 +65,13 @@ public class QuestWinLose extends ControlWinLose {
controller.actionOnQuit();
super.actionOnQuit();
}
@Override
public void actionOnContinue() {
//prevent loading overlay to show on continuing match... TODO: refactor this to a better implementation
if (HomeScreen.instance.getQuestWorld().contains("Random")) {
HomeScreen.instance.updateQuestWorld(HomeScreen.instance.getQuestWorld().replace("Random","XandomX"));
}
super.actionOnContinue();
}
}

2
forge-gui-mobile/src/forge/screens/quest/QuestDuelsScreen.java
View File

@@ -75,7 +75,7 @@ public class QuestDuelsScreen extends QuestLaunchScreen {
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
LoadingOverlay.show("Loading Random Quest", new Runnable() {
LoadingOverlay.show(Localizer.getInstance().getMessage("lblLoadingCurrentQuest"), new Runnable() {
@Override
public void run() {
generateDuels();