diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java index 1883206176da6d08a52860bd5ce60a60eb0efab3..d865d91b0cc549391cf72da5860d267a58de64d2 100644 --- a/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java +++ b/core/src/cz/nic/tablexia/screen/encyclopedia/EncyclopediaScreen.java @@ -187,6 +187,7 @@ public class EncyclopediaScreen extends AbstractTablexiaScreen<Void> { } private void prepareButtons() { + // TODO: 1.12.15 add font resizing TablexiaButton btnFontPlus = new TablexiaButton(FONT_PLUS_TEXT, TablexiaButton.ButtonType.BLUE); btnFontPlus.setSize(FONT_BUTTON_WIDTH, FONT_BUTTON_WIDTH); btnFontPlus.setPosition(BUTTONS_MARGIN_LEFT, RIGHT_BUTTONS_PAD_BOTTOM); diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java index f08fadc1d174dabd15ed1b718e9e1c2b8cc621c5..39389ee1b82c61807e8fb3e01bf73bd4f834b6b8 100644 --- a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java +++ b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Header.java @@ -1,11 +1,14 @@ package cz.nic.tablexia.screen.encyclopedia.content.model; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.InputEvent; import com.badlogic.gdx.scenes.scene2d.ui.Cell; +import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; +import cz.nic.tablexia.loader.application.ApplicationFontManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; import cz.nic.tablexia.screen.encyclopedia.EncyclopediaScreen; import cz.nic.tablexia.screen.encyclopedia.assets.EncyclopediaAssets; @@ -17,6 +20,8 @@ import cz.nic.tablexia.util.ui.TablexiaButton; public class Header extends Content { private String soundResource; private TextContent textContent; + private ApplicationFontManager.FontType headerFont = ApplicationFontManager.FontType.ROBOTO_BOLD_20; + public Header() { //for serialization purposes @@ -29,10 +34,9 @@ public class Header extends Content { @Override public Actor render(final AbstractTablexiaScreen screen, float parentContainerWidth) { - //TODO add ImageButton with play icon - //TODO enlarge header label font Table table = new Table(); - Actor label = textContent.render(screen, parentContainerWidth); + Label label = (Label) textContent.render(screen, parentContainerWidth); + label.setStyle(new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(headerFont), Color.BLACK)); table.add(label).expandX().left(); if (soundResource != null) { final TablexiaButton button = new TablexiaButton(screen.getText(EncyclopediaAssets.PLAY), TablexiaButton.ButtonType.GREEN); diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Hint.java b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Hint.java index bf2905fe5554469d1c7a5d2595fcf66581ab18ec..9963241510913d40e9017d2a4cb942b9ab0f9207 100644 --- a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Hint.java +++ b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/Hint.java @@ -10,9 +10,10 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.utils.NinePatchDrawable; import com.badlogic.gdx.utils.Align; -import cz.nic.tablexia.util.Point; +import cz.nic.tablexia.loader.application.ApplicationFontManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; import cz.nic.tablexia.screen.encyclopedia.assets.EncyclopediaAssets; +import cz.nic.tablexia.util.Point; /** * Created by Václav TarantĂk on 3.9.15. @@ -24,12 +25,14 @@ public class Hint extends Content { private ImageContent imageContent; private TextContent textContent; - public Hint(){ + private ApplicationFontManager.FontType textBoldFont = ApplicationFontManager.FontType.ROBOTO_BOLD_16; + + public Hint() { //for serialization purposes } - public Hint(ImageContent imageContent,TextContent textContent){ - this.imageContent= imageContent; + public Hint(ImageContent imageContent, TextContent textContent) { + this.imageContent = imageContent; this.textContent = textContent; } @@ -50,9 +53,9 @@ public class Hint extends Content { } @Override - public Actor render(AbstractTablexiaScreen screen,float parentContainerWidth) { + public Actor render(AbstractTablexiaScreen screen, float parentContainerWidth) { //TODO create constants for paddings - Label.LabelStyle titleLabelStyle = new Label.LabelStyle(screen.getDefaultBoldFont(),Color.BLACK); + Label.LabelStyle titleLabelStyle = new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(textBoldFont), Color.BLACK); Table contentTable = new Table(); contentTable.setWidth(parentContainerWidth); contentTable.setBackground(new NinePatchDrawable(new NinePatch(screen.getScreenPatch(EncyclopediaAssets.HINT_BACKGROUND)))); diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/TextContent.java b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/TextContent.java index cee00e5f71a92fd9463a284ce8badc65b570ab58..c160dde17aeb6162cf4522c0acf3997f524ed1b2 100644 --- a/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/TextContent.java +++ b/core/src/cz/nic/tablexia/screen/encyclopedia/content/model/TextContent.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.scenes.scene2d.Actor; import com.badlogic.gdx.scenes.scene2d.ui.Label; +import cz.nic.tablexia.loader.application.ApplicationFontManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; /** @@ -13,6 +14,9 @@ public class TextContent extends Content { private String text; private boolean bold; + private ApplicationFontManager.FontType textBoldFont = ApplicationFontManager.FontType.ROBOTO_BOLD_16; + private ApplicationFontManager.FontType textRegularFont = ApplicationFontManager.FontType.ROBOTO_REGULAR_16; + public TextContent() { //for serialization purposes } @@ -24,9 +28,9 @@ public class TextContent extends Content { @Override public Actor render(AbstractTablexiaScreen screen, float parentContainerWidth) { - Label.LabelStyle labelStyle = new Label.LabelStyle(screen.getDefaultRegularFont(), Color.BLACK); + Label.LabelStyle labelStyle = new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(textRegularFont), Color.BLACK); if (isBold()) { - labelStyle = new Label.LabelStyle(screen.getDefaultBoldFont(), Color.BLACK); + labelStyle = new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(textBoldFont), Color.BLACK); } Label paragraph = new Label(screen.getText(getText()), labelStyle); paragraph.setWrap(true); diff --git a/core/src/cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java b/core/src/cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java index 101eb5f6ce04068452bcc780700eb0768d9dc229..1f903f7e523ccc0db69d7e61ffe57c5d6feefc3e 100644 --- a/core/src/cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java +++ b/core/src/cz/nic/tablexia/screen/encyclopedia/menu/MenuWidget.java @@ -13,8 +13,9 @@ import com.badlogic.gdx.utils.Array; import java.util.HashMap; import java.util.Map; -import cz.nic.tablexia.util.Point; +import cz.nic.tablexia.loader.application.ApplicationFontManager; import cz.nic.tablexia.screen.AbstractTablexiaScreen; +import cz.nic.tablexia.util.Point; import cz.nic.tablexia.util.ui.ClickListenerWithSound; /** @@ -23,12 +24,13 @@ import cz.nic.tablexia.util.ui.ClickListenerWithSound; public class MenuWidget extends VerticalGroup { Array<MenuItem> menuItemValues; private Map<MenuItem, TextButton> menuItems; - private NinePatchDrawable selectionDrawable; - private AbstractTablexiaScreen screen; + private NinePatchDrawable selectionDrawable; + private AbstractTablexiaScreen screen; private OnMenuItemClickListener onItemClickListener; - private int selectedItemIndex; + private int selectedItemIndex; + private ApplicationFontManager.FontType textButtonFont = ApplicationFontManager.FontType.ROBOTO_BOLD_20; - public MenuWidget(AbstractTablexiaScreen screen,Point size, String selectionDrawableResource, OnMenuItemClickListener onItemClickListener) { + public MenuWidget(AbstractTablexiaScreen screen, Point size, String selectionDrawableResource, OnMenuItemClickListener onItemClickListener) { menuItemValues = new Array<MenuItem>(MenuItem.values()); menuItems = new HashMap<MenuItem, TextButton>(); this.screen = screen; @@ -39,9 +41,8 @@ public class MenuWidget extends VerticalGroup { } private void initItems() { - //// FIXME: 15.10.15 Smaller font for menu items so it fits with visible bookmark - for (final MenuItem item: menuItemValues) { - final TextButton menuItem = new TextButton(screen.getText(item.getTitle()),createMenuItemStyle()); + for (final MenuItem item : menuItemValues) { + final TextButton menuItem = new TextButton(screen.getText(item.getTitle()), createMenuItemStyle()); menuItem.getLabel().setAlignment(Align.left); menuItem.removeListener(menuItem.getClickListener()); menuItem.addListener(new ClickListenerWithSound() { @@ -73,7 +74,7 @@ public class MenuWidget extends VerticalGroup { } private TextButton.TextButtonStyle createMenuItemStyle() { - TextButton.TextButtonStyle style = new TextButton.TextButtonStyle(null, null, selectionDrawable, screen.getDefaultBoldFont()); + TextButton.TextButtonStyle style = new TextButton.TextButtonStyle(null, null, selectionDrawable, ApplicationFontManager.getInstance().getFont(textButtonFont)); style.fontColor = Color.BLACK; return style; }