Relintai/mtg-forge-ios
1
0
Fork 0
mirror of https://github.com/Relintai/mtg-forge-ios.git synced 2025-04-15 00:48:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the BitmapFont import errors, but I'm not comitting 2 of the files for now.

Browse Source
This commit is contained in:
Relintai 2017-10-06 12:21:29 +02:00
parent cf014c9b04
commit 8dfa917ed1
60 changed files with 74 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.gradle
View File

@ -124,6 +124,7 @@ project(":forge-gui-mobile-desktop") {
compile project(":forge-ai") compile project(":forge-ai")
compile project(":forge-gui") compile project(":forge-gui")
compile project(":forge-gui-mobile") compile project(":forge-gui-mobile")
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.miglayout:miglayout:3.5.5" compile "com.miglayout:miglayout:3.5.5"

3
forge-gui-mobile/src/forge/Graphics.java
View File

@ -4,8 +4,7 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;

3
forge-gui-mobile/src/forge/assets/TextRenderer.java
View File

@ -6,8 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import forge.Graphics; import forge.Graphics;
import forge.card.CardFaceSymbols; import forge.card.CardFaceSymbols;

2
forge-gui-mobile/src/forge/card/CardListPreview.java
View File

@ -1,6 +1,6 @@
package forge.card; package forge.card;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.item.PaperCard; import forge.item.PaperCard;

3
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@ -7,8 +7,7 @@ import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Pixmap;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import com.badlogic.gdx.graphics.g2d.PixmapPacker; import com.badlogic.gdx.graphics.g2d.PixmapPacker;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;

2
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import forge.Forge; import forge.Forge;

2
forge-gui-mobile/src/forge/deck/AddBasicLandsDialog.java
View File

@ -48,7 +48,7 @@ import forge.toolbox.FTextArea;
import forge.util.Callback; import forge.util.Callback;
import forge.util.Utils; import forge.util.Utils;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import java.util.Map; import java.util.Map;

2
forge-gui-mobile/src/forge/deck/FDeckChooser.java
View File

@ -41,7 +41,7 @@ import forge.util.storage.IStorage;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.util.ArrayList; import java.util.ArrayList;

2
forge-gui-mobile/src/forge/deck/FDeckEditor.java
View File

@ -1,7 +1,7 @@
package forge.deck; package forge.deck;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;

2
forge-gui-mobile/src/forge/itemmanager/DeckManager.java
View File

@ -20,7 +20,7 @@ import forge.toolbox.FList;
import forge.toolbox.FList.CompactModeHandler; import forge.toolbox.FList.CompactModeHandler;
import forge.util.Utils; import forge.util.Utils;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import java.util.Map.Entry; import java.util.Map.Entry;

2
forge-gui-mobile/src/forge/itemmanager/ItemManager.java
View File

@ -18,7 +18,7 @@
package forge.itemmanager; package forge.itemmanager;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;

2
forge-gui-mobile/src/forge/itemmanager/SpellShopManager.java
View File

@ -3,7 +3,7 @@ package forge.itemmanager;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.base.Function; import com.google.common.base.Function;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/itemmanager/filters/AdvancedSearchFilter.java
View File

@ -1,6 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;

2
forge-gui-mobile/src/forge/itemmanager/filters/FormatFilter.java
View File

@ -28,7 +28,7 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> { public abstract class FormatFilter<T extends InventoryItem> extends ItemFilter<T> {

2
forge-gui-mobile/src/forge/itemmanager/filters/ListLabelFilter.java
View File

@ -1,6 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.item.InventoryItem; import forge.item.InventoryItem;

2
forge-gui-mobile/src/forge/itemmanager/filters/TextSearchFilter.java
View File

@ -1,6 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;

2
forge-gui-mobile/src/forge/itemmanager/filters/ToggleButtonsFilter.java
View File

@ -3,7 +3,7 @@ package forge.itemmanager.filters;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.assets.FImage; import forge.assets.FImage;
import forge.item.InventoryItem; import forge.item.InventoryItem;

2
forge-gui-mobile/src/forge/itemmanager/filters/ValueRangeFilter.java
View File

@ -1,6 +1,6 @@
package forge.itemmanager.filters; package forge.itemmanager.filters;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.card.CardRules; import forge.card.CardRules;

2
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@ -37,7 +37,7 @@ import java.util.Map.Entry;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;

3
forge-gui-mobile/src/forge/menu/FMagnifyView.java
View File

@ -1,7 +1,6 @@
package forge.menu; package forge.menu;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

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

@ -3,7 +3,7 @@ package forge.screens;
import java.util.List; import java.util.List;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import forge.Forge; import forge.Forge;

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

@ -1,6 +1,6 @@
package forge.screens; package forge.screens;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/screens/constructed/AvatarSelector.java
View File

@ -19,7 +19,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
public class AvatarSelector extends FScreen { public class AvatarSelector extends FScreen {
public static int getRandomAvatar(List<Integer> usedAvatars) { public static int getRandomAvatar(List<Integer> usedAvatars) {

2
forge-gui-mobile/src/forge/screens/constructed/LobbyScreen.java
View File

@ -5,7 +5,7 @@ import java.util.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import forge.FThreads; import forge.FThreads;

2
forge-gui-mobile/src/forge/screens/constructed/PlayerPanel.java
View File

@ -6,7 +6,7 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;

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

@ -3,7 +3,7 @@ package forge.screens.home;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/screens/limited/LoadDraftScreen.java
View File

@ -1,6 +1,6 @@
package forge.screens.limited; package forge.screens.limited;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.FThreads; import forge.FThreads;
import forge.Forge; import forge.Forge;

2
forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
View File

@ -1,7 +1,7 @@
package forge.screens.match.views; package forge.screens.match.views;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/screens/match/views/VLog.java
View File

@ -2,7 +2,7 @@ package forge.screens.match.views;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

2
forge-gui-mobile/src/forge/screens/match/views/VManaPool.java
View File

@ -3,7 +3,7 @@ package forge.screens.match.views;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

3
forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java
View File

@ -4,8 +4,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

2
forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/screens/match/views/VPlayers.java
View File

@ -1,6 +1,6 @@
package forge.screens.match.views; package forge.screens.match.views;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;

2
forge-gui-mobile/src/forge/screens/match/views/VStack.java
View File

@ -6,7 +6,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.Forge; import forge.Forge;

2
forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java
View File

@ -1,7 +1,7 @@
package forge.screens.match.winlose; package forge.screens.match.winlose;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.FThreads; import forge.FThreads;
import forge.Forge; import forge.Forge;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestCommandersScreen.java
View File

@ -2,7 +2,7 @@ package forge.screens.planarconquest;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import forge.Forge; import forge.Forge;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
View File

@ -3,7 +3,7 @@ package forge.screens.planarconquest;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneswalkScreen.java
View File

@ -1,7 +1,7 @@
package forge.screens.planarconquest; package forge.screens.planarconquest;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.ImageKeys; import forge.ImageKeys;

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestStatsScreen.java
View File

@ -1,6 +1,6 @@
package forge.screens.planarconquest; package forge.screens.planarconquest;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.assets.FImage; import forge.assets.FImage;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;

2
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.FThreads; import forge.FThreads;
import forge.Graphics; import forge.Graphics;

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

@ -10,7 +10,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.FThreads; import forge.FThreads;
import forge.Forge; import forge.Forge;

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

@ -3,7 +3,7 @@ package forge.screens.quest;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.Forge; import forge.Forge;

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

@ -1,6 +1,6 @@
package forge.screens.quest; package forge.screens.quest;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;

6
forge-gui-mobile/src/forge/screens/quest/QuestDecksScreen.java
View File

@ -1,6 +1,7 @@
package forge.screens.quest; package forge.screens.quest;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.utils.Align;
import forge.FThreads; import forge.FThreads;
import forge.Forge; import forge.Forge;
@ -34,7 +35,7 @@ public class QuestDecksScreen extends FScreen {
private final FButton btnRandom = add(new FButton("Random Deck")); private final FButton btnRandom = add(new FButton("Random Deck"));
private final FLabel lblInfo = add(new FLabel.Builder() private final FLabel lblInfo = add(new FLabel.Builder()
.align(HAlignment.CENTER).font(FSkinFont.get(16)) .align(Align.center).font(FSkinFont.get(16))
.text("Build or select a deck").build()); .text("Build or select a deck").build());
private final FEventHandler onDeckSelectionChanged = new FEventHandler() { private final FEventHandler onDeckSelectionChanged = new FEventHandler() {
@ -161,6 +162,7 @@ public class QuestDecksScreen extends FScreen {
float y = startY + PADDING / 2; float y = startY + PADDING / 2;
float w = width - 2 * PADDING; float w = width - 2 * PADDING;
// lblInfo.get
lblInfo.setBounds(x, y, w, lblInfo.getAutoSizeBounds().height); lblInfo.setBounds(x, y, w, lblInfo.getAutoSizeBounds().height);
y += lblInfo.getHeight(); y += lblInfo.getHeight();

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

@ -1,6 +1,6 @@
package forge.screens.quest; package forge.screens.quest;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.assets.FSkinFont; import forge.assets.FSkinFont;
import forge.interfaces.IButton; import forge.interfaces.IButton;

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

@ -1,7 +1,7 @@
package forge.screens.quest; package forge.screens.quest;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.*; import forge.assets.*;
import forge.assets.FSkinColor.Colors; import forge.assets.FSkinColor.Colors;

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

@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.FThreads; import forge.FThreads;
import forge.assets.FImage; import forge.assets.FImage;

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

@ -1,6 +1,6 @@
package forge.screens.quest; package forge.screens.quest;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.FThreads; import forge.FThreads;

2
forge-gui-mobile/src/forge/toolbox/FCheckBox.java
View File

@ -1,6 +1,6 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FImage; import forge.assets.FImage;

2
forge-gui-mobile/src/forge/toolbox/FComboBox.java
View File

@ -3,7 +3,7 @@ package forge.toolbox;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.interfaces.IComboBox; import forge.interfaces.IComboBox;

2
forge-gui-mobile/src/forge/toolbox/FFileChooser.java
View File

@ -6,7 +6,7 @@ import java.io.FilenameFilter;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;

2
forge-gui-mobile/src/forge/toolbox/FGroupBox.java
View File

@ -1,6 +1,6 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

24
forge-gui-mobile/src/forge/toolbox/FLabel.java
View File

@ -1,8 +1,8 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import forge.Graphics; import forge.Graphics;
import forge.UiCommand; import forge.UiCommand;
@ -25,7 +25,7 @@ public class FLabel extends FDisplayObject implements IButton {
private float bldIconScaleFactor = 0.8f; private float bldIconScaleFactor = 0.8f;
private FSkinFont bldFont = FSkinFont.get(14); private FSkinFont bldFont = FSkinFont.get(14);
private float bldAlphaComposite = 0.7f; private float bldAlphaComposite = 0.7f;
private HAlignment bldAlignment = HAlignment.LEFT; private Align bldAlignment = Align.LEFT;
private Vector2 bldInsets = new Vector2(DEFAULT_INSETS, DEFAULT_INSETS); private Vector2 bldInsets = new Vector2(DEFAULT_INSETS, DEFAULT_INSETS);
private boolean bldSelectable = false; private boolean bldSelectable = false;
@ -48,7 +48,7 @@ public class FLabel extends FDisplayObject implements IButton {
// Begin builder methods. // Begin builder methods.
public Builder text(final String s0) { this.bldText = s0; return this; } public Builder text(final String s0) { this.bldText = s0; return this; }
public Builder icon(final FImage i0) { this.bldIcon = i0; return this; } public Builder icon(final FImage i0) { this.bldIcon = i0; return this; }
public Builder align(final HAlignment a0) { this.bldAlignment = a0; return this; } public Builder align(final Align a0) { this.bldAlignment = a0; return this; }
public Builder insets(final Vector2 v0) { this.bldInsets = v0; return this; } public Builder insets(final Vector2 v0) { this.bldInsets = v0; return this; }
public Builder opaque(final boolean b0) { this.bldOpaque = b0; return this; } public Builder opaque(final boolean b0) { this.bldOpaque = b0; return this; }
public Builder opaque() { opaque(true); return this; } public Builder opaque() { opaque(true); return this; }
@ -103,7 +103,7 @@ public class FLabel extends FDisplayObject implements IButton {
private float iconScaleFactor; private float iconScaleFactor;
private FSkinFont font; private FSkinFont font;
private float alphaComposite; private float alphaComposite;
private HAlignment alignment; private Align alignment;
private Vector2 insets; private Vector2 insets;
private boolean selectable, selected, opaque, iconInBackground, iconScaleAuto, iconScaleWithFont, pressed; private boolean selectable, selected, opaque, iconInBackground, iconScaleAuto, iconScaleWithFont, pressed;
@ -186,10 +186,10 @@ public class FLabel extends FDisplayObject implements IButton {
insets = insets0; insets = insets0;
} }
public HAlignment getAlignment() { public Align getAlignment() {
return alignment; return alignment;
} }
public void setAlignment(final HAlignment alignment0) { public void setAlignment(final Align alignment0) {
alignment = alignment0; alignment = alignment0;
} }
@ -342,13 +342,13 @@ public class FLabel extends FDisplayObject implements IButton {
float iconOffset = iconWidth + insets.x + getExtraGapBetweenIconAndText(); float iconOffset = iconWidth + insets.x + getExtraGapBetweenIconAndText();
if (iconInBackground || text.isEmpty()) { if (iconInBackground || text.isEmpty()) {
if (alignment == HAlignment.CENTER) { if (alignment == Align.center) {
x += (w - iconWidth) / 2; x += (w - iconWidth) / 2;
} }
y += (h - iconHeight) / 2; y += (h - iconHeight) / 2;
} }
else { else {
if (alignment == HAlignment.CENTER) { if (alignment == Align.center) {
float dx; float dx;
while (true) { while (true) {
dx = (w - iconOffset - getTextWidth()) / 2; dx = (w - iconOffset - getTextWidth()) / 2;
@ -362,7 +362,7 @@ public class FLabel extends FDisplayObject implements IButton {
font = font.shrink(); font = font.shrink();
} }
} }
else if (alignment == HAlignment.RIGHT) { else if (alignment == Align.right) {
float dx; float dx;
while (true) { while (true) {
dx = (w - iconWidth - getTextWidth() - insets.x); dx = (w - iconWidth - getTextWidth() - insets.x);
@ -384,7 +384,7 @@ public class FLabel extends FDisplayObject implements IButton {
if (!text.isEmpty()) { if (!text.isEmpty()) {
x += iconOffset; x += iconOffset;
w -= iconOffset; w -= iconOffset;
drawText(g, x, textY, w, h, HAlignment.LEFT); drawText(g, x, textY, w, h, Align.left);
} }
} }
else if (!text.isEmpty()) { else if (!text.isEmpty()) {
@ -392,7 +392,7 @@ public class FLabel extends FDisplayObject implements IButton {
} }
} }
private void drawText(Graphics g, float x, float y, float w, float h, HAlignment align) { private void drawText(Graphics g, float x, float y, float w, float h, Align align) {
g.startClip(x, y, w, h); g.startClip(x, y, w, h);
if (textRenderer == null) { if (textRenderer == null) {
g.drawText(text, font, textColor, x, y, w, h, false, align, true); g.drawText(text, font, textColor, x, y, w, h, false, align, true);

2
forge-gui-mobile/src/forge/toolbox/FList.java
View File

@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;

2
forge-gui-mobile/src/forge/toolbox/FNumericTextField.java
View File

@ -1,6 +1,6 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
public class FNumericTextField extends FTextField { public class FNumericTextField extends FTextField {
private int value; private int value;

3
forge-gui-mobile/src/forge/toolbox/FTextField.java
View File

@ -1,8 +1,7 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Input.Keys;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.BitmapFont.TextBounds;
import forge.Forge; import forge.Forge;
import forge.Forge.KeyInputAdapter; import forge.Forge.KeyInputAdapter;

2
forge-gui-mobile/src/forge/toolbox/FToggleSwitch.java
View File

@ -1,6 +1,6 @@
package forge.toolbox; package forge.toolbox;
import com.badlogic.gdx.graphics.g2d.BitmapFont.HAlignment; import com.badlogic.gdx.graphics.g2d.BitmapFont;
import forge.Graphics; import forge.Graphics;
import forge.assets.FSkinColor; import forge.assets.FSkinColor;