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

update progressbar, update boosterdraft readfile

Browse Source 
also removed unneccesary settings since forge uses shaders for round corners for rendering borders
This commit is contained in:
Anthony Calosa
2025-08-08 20:46:12 +08:00
parent 00332ff3fe
commit 286fcd3fbe
12 changed files with 48 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
forge-gui-mobile/src/forge/Forge.java
View File

@@ -48,7 +48,6 @@ import forge.sound.SoundSystem;
import forge.toolbox.*;
import forge.util.*;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.*;
@@ -102,7 +101,6 @@ public class Forge implements ApplicationListener {
public static boolean animatedCardTapUntap = false;
public static String enableUIMask = "Crop";
public static String selector = "Default";
public static boolean enablePreloadExtendedArt = false;
public static boolean isTabletDevice = false;
public static String locale = "en-US";
public Assets assets;
@@ -244,27 +242,8 @@ public class Forge implements ApplicationListener {
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblLoadingCardTranslations"));
CardTranslation.preloadTranslation(locale, ForgeConstants.LANG_DIR);
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
//add reminder to preload
if (enablePreloadExtendedArt) {
if (autoCache)
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
else
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblPreloadExtendedArt"));
} else {
if (autoCache)
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
else
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
}
Gdx.app.postRunnable(() -> {
afterDbLoaded();
/* call preloadExtendedArt here, if we put it above we will *
* get error: No OpenGL context found in the current thread. */
preloadExtendedArt();
});
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblPrepareDatabase"));
Gdx.app.postRunnable(this::afterDbLoaded);
};
//see if app or assets need updating
FThreads.invokeInBackgroundThread(() -> AssetsDownloader.checkForUpdates(exited, runnable));
@@ -303,22 +282,6 @@ public class Forge implements ApplicationListener {
return currentScene;
}
private void preloadExtendedArt() {
if (!enablePreloadExtendedArt || !enableUIMask.equals("Full"))
return;
List<String> borderlessCardlistkeys = FileUtil.readFile(ForgeConstants.BORDERLESS_CARD_LIST_FILE);
if (borderlessCardlistkeys.isEmpty())
return;
List<String> filteredkeys = new ArrayList<>();
for (String cardname : borderlessCardlistkeys) {
File image = new File(ForgeConstants.CACHE_CARD_PICS_DIR + ForgeConstants.PATH_SEPARATOR + cardname + ".jpg");
if (image.exists())
filteredkeys.add(cardname);
}
if (!filteredkeys.isEmpty())
ImageCache.getInstance().preloadCache(filteredkeys);
}
private void preloadBoosterDrafts() {
//preloading of custom drafts
BoosterDraft.initializeCustomDrafts();
@@ -384,6 +347,10 @@ public class Forge implements ApplicationListener {
}
}
protected void afterDbLoaded() {
if (GuiBase.isAndroid() && autoCache)
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup") + "\nDetected RAM: " + totalDeviceRAM + "MB. Cache size: " + cacheSize);
else
getSplashScreen().getProgressBar().setDescription(getLocalizer().getMessage("lblFinishingStartup"));
//override transition & title bg
try {
FileHandle transitionFile = Config.instance().getFile("ui/transition.png");

2
forge-gui-mobile/src/forge/assets/ImageCache.java
View File

@@ -407,7 +407,7 @@ public class ImageCache {
public void preloadCache(Deck deck) {
if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_DISABLE_CARD_IMAGES))
return;
if (deck == null || !Forge.enablePreloadExtendedArt)
if (deck == null)
return;
if (deck.getAllCardsInASinglePool().toFlatList().size() <= 100) {
for (PaperCard p : deck.getAllCardsInASinglePool().toFlatList()) {

10
forge-gui-mobile/src/forge/screens/settings/SettingsPage.java
View File

@@ -616,16 +616,6 @@ public class SettingsPage extends TabPage<SettingsScreen> {
ImageCache.getInstance().disposeTextures();
}
}, 4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART,
Forge.getLocalizer().getMessage("lblPreloadExtendedArtCards"),
Forge.getLocalizer().getMessage("nlPreloadExtendedArtCards")){
@Override
public void select() {
super.select();
//update
Forge.enablePreloadExtendedArt = FModel.getPreferences().getPrefBoolean(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
}
},4);
lstSettings.addItem(new BooleanSetting(FPref.UI_ENABLE_MATCH_SCROLL_INDICATOR,
Forge.getLocalizer().getMessage("lblMatchScrollIndicator"),
Forge.getLocalizer().getMessage("nlMatchScrollIndicator")),