diff --git a/.gitattributes b/.gitattributes index f64f6442e52..d153fcb5ec6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1101,7 +1101,6 @@ forge-gui-mobile/src/forge/card/CardRenderer.java -text forge-gui-mobile/src/forge/card/CardZoom.java -text forge-gui-mobile/src/forge/deck/FDeckChooser.java -text forge-gui-mobile/src/forge/deck/FDeckViewer.java -text -forge-gui-mobile/src/forge/download/GuiDownloader.java -text forge-gui-mobile/src/forge/error/BugReportDialog.java -text forge-gui-mobile/src/forge/itemmanager/CardManager.java -text forge-gui-mobile/src/forge/itemmanager/DeckManager.java -text @@ -1176,6 +1175,9 @@ forge-gui-mobile/src/forge/screens/match/winlose/LimitedWinLose.java -text forge-gui-mobile/src/forge/screens/match/winlose/ViewWinLose.java -text forge-gui-mobile/src/forge/screens/quest/QuestScreen.java -text forge-gui-mobile/src/forge/screens/sealed/SealedScreen.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/HelpPage.java -text forge-gui-mobile/src/forge/screens/settings/SettingsPage.java -text forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java -text forge-gui-mobile/src/forge/toolbox/DualListBox.java -text diff --git a/forge-gui-mobile/src/forge/screens/TabPageScreen.java b/forge-gui-mobile/src/forge/screens/TabPageScreen.java index 551367f324d..7be5eb82f9f 100644 --- a/forge-gui-mobile/src/forge/screens/TabPageScreen.java +++ b/forge-gui-mobile/src/forge/screens/TabPageScreen.java @@ -153,7 +153,7 @@ public class TabPageScreen extends FScreen { //draw caption float y = h - TAB_PADDING - TAB_FONT.getCapHeight(); - g.drawText(caption, TAB_FONT, TAB_FORE_COLOR, 0, y, w, h - y, false, HAlignment.CENTER, false); + g.drawText(caption, TAB_FONT, TAB_FORE_COLOR, TAB_PADDING, y - TAB_PADDING, w - 2 * TAB_PADDING, h - y + TAB_PADDING, false, HAlignment.CENTER, true); //draw icon if one if (icon != null) { diff --git a/forge-gui-mobile/src/forge/screens/settings/FilesPage.java b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java new file mode 100644 index 00000000000..4de230d37ce --- /dev/null +++ b/forge-gui-mobile/src/forge/screens/settings/FilesPage.java @@ -0,0 +1,16 @@ +package forge.screens.settings; + +import forge.assets.FSkinImage; +import forge.screens.TabPageScreen.TabPage; + +public class FilesPage extends TabPage { + + protected FilesPage() { + super("Files", FSkinImage.OPEN); + } + + @Override + protected void doLayout(float width, float height) { + + } +} diff --git a/forge-gui-mobile/src/forge/download/GuiDownloader.java b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java similarity index 98% rename from forge-gui-mobile/src/forge/download/GuiDownloader.java rename to forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java index 1200f882f0b..c82a6300c09 100644 --- a/forge-gui-mobile/src/forge/download/GuiDownloader.java +++ b/forge-gui-mobile/src/forge/screens/settings/GuiDownloader.java @@ -15,12 +15,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package forge.download; +package forge.screens.settings; import java.net.Proxy; import forge.UiCommand; import forge.assets.FSkinFont; +import forge.download.GuiDownloadService; import forge.toolbox.*; import forge.toolbox.FEvent.FEventHandler; import forge.toolbox.FRadioButton.RadioButtonGroup; diff --git a/forge-gui-mobile/src/forge/screens/settings/HelpPage.java b/forge-gui-mobile/src/forge/screens/settings/HelpPage.java new file mode 100644 index 00000000000..4ef2a888067 --- /dev/null +++ b/forge-gui-mobile/src/forge/screens/settings/HelpPage.java @@ -0,0 +1,16 @@ +package forge.screens.settings; + +import forge.assets.FSkinImage; +import forge.screens.TabPageScreen.TabPage; + +public class HelpPage extends TabPage { + + protected HelpPage() { + super("Help", FSkinImage.UNKNOWN); + } + + @Override + protected void doLayout(float width, float height) { + + } +} diff --git a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java index 82cb2b93390..83e457e6160 100644 --- a/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java +++ b/forge-gui-mobile/src/forge/screens/settings/SettingsScreen.java @@ -16,9 +16,10 @@ public class SettingsScreen extends TabPageScreen { public SettingsScreen() { super(new TabPage[] { - new SettingsPage() + new SettingsPage(), + new FilesPage(), + new HelpPage() }); - // TODO Auto-generated constructor stub } @Override