#66 Smooth text in Form and Profile screen

core/src/cz/nic/tablexia/screen/createuser/FormScreen.java

@@ -50,8 +50,11 @@ import cz.nic.tablexia.util.ui.dialog.text.DialogTextContent;
 
 public class FormScreen extends AbstractTablexiaScreen<Void> {
 
-    private static final String CREATEUSER_FORM_AGE_TEXT_KEY    = "createuser_form_age";
-    private static final String CREATEUSER_FORM_GENDER_TEXT_KEY = "createuser_form_gender";
+    private static final String                             CREATEUSER_FORM_AGE_TEXT_KEY    = "createuser_form_age";
+    private static final String                             CREATEUSER_FORM_GENDER_TEXT_KEY = "createuser_form_gender";
+    private static final Color                              TEXT_COLOR                      = Color.BLACK;
+    private static final ApplicationFontManager.FontType    TEXT_14                         = ApplicationFontManager.FontType.ROBOTO_REGULAR_14;
+    private static final ApplicationFontManager.FontType    TEXT_20                         = ApplicationFontManager.FontType.ROBOTO_REGULAR_20;
 
     private static final int    MUGSHOT_HEIGHT = 250;
     public static final  String GFX_PATH       = "gfx/";
@@ -80,7 +83,6 @@ public class FormScreen extends AbstractTablexiaScreen<Void> {
 
     @Override
     protected void screenLoaded(Map<String, String> screenState) {
-        //getStage().setDebugAll(TablexiaSettings.getInstance().isShowBoundingBoxes());
         final Group group = new Group();
 
         Image background = new TablexiaNoBlendingImage(getScreenTextureRegion(GFX_PATH + "table"));
@@ -104,13 +106,13 @@ public class FormScreen extends AbstractTablexiaScreen<Void> {
         });
 
         this.age = 10;
-        final Label age = new Label(getText(CREATEUSER_FORM_AGE_TEXT_KEY), getLabelStyle());
-        ageLabel = new Label(String.valueOf(this.age), getLabelStyle());
-        final Label gender = new Label(getText(CREATEUSER_FORM_GENDER_TEXT_KEY), getLabelStyle());
-        nameLabel = new Label("", getLabelStyle());
+        Label.LabelStyle labelStyleFontSize16 = new Label.LabelStyle(getFont(TEXT_14), TEXT_COLOR);
+        Label.LabelStyle labelStyleFontSize20 = new Label.LabelStyle(getFont(TEXT_20), TEXT_COLOR);
+        final Label age = new Label(getText(CREATEUSER_FORM_AGE_TEXT_KEY), labelStyleFontSize16);
+        ageLabel = new Label(String.valueOf(this.age), labelStyleFontSize20);
+        final Label gender = new Label(getText(CREATEUSER_FORM_GENDER_TEXT_KEY), labelStyleFontSize16);
+        nameLabel = new Label("", labelStyleFontSize20);
 
-        age.setFontScale(0.7f);
-        gender.setFontScale(0.7f);
         nameLabel.setSize(getStage().getWidth() * 0.2f, getStage().getWidth() * 0.05f);
         nameLabel.setPosition(getStage().getWidth() * 0.57f, getStage().getWidth() * 0.27f);
         age.setPosition(getStage().getWidth() * 0.58f, getStage().getWidth() * 0.225f);
@@ -182,8 +184,8 @@ public class FormScreen extends AbstractTablexiaScreen<Void> {
         signaturePane.setBounds(600, getStage().getHeight() * 0.1f, 300, getStage().getHeight() * 0.2f);
 
         // pencil and stamp layers
-        group.addActor(pen = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "pencil_dropped"), getStage().getWidth() * 0.2f, getStage().getWidth() * 0.85f, getStage().getWidth() * -0.13f));
-        group.addActor(stamp = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "stamp_left_dropped"), getStage().getWidth() * 0.2f, getStage().getWidth() * -0.01f, getStage().getWidth() * -0.05f));
+        group.addActor(pen = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "pencil_dropped", false), getStage().getWidth() * 0.2f, getStage().getWidth() * 0.85f, getStage().getWidth() * -0.13f));
+        group.addActor(stamp = ScaleUtil.createImageWidthPosition(getScreenTextureRegion(GFX_PATH + "stamp_left_dropped", false), getStage().getWidth() * 0.2f, getStage().getWidth() * -0.01f, getStage().getWidth() * -0.05f));
         pen.addListener(new DragActorListener(pen, true, new DragActorListener.DragDropListener() {
             @Override
             public void dropped(float x, float y) {
@@ -356,10 +358,6 @@ public class FormScreen extends AbstractTablexiaScreen<Void> {
         return vg;
     }
 
-    private Label.LabelStyle getLabelStyle() {
-        return new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(ApplicationFontManager.APPLICATION_DEFAULT_FONT_REGULAR), Color.BLACK);
-    }
-
     public void setAge(int age) {
         ageLabel.setText(String.valueOf(this.age = age));
     }

core/src/cz/nic/tablexia/screen/createuser/form/SignatureDialog.java

@@ -23,7 +23,6 @@ public abstract class SignatureDialog extends TwoButtonDialog {
                 TablexiaButton.ButtonType.GREEN,
                 formScreen.getText("createuser_form_cancel"),
                 formScreen.getText("createuser_form_sign"));
-        setDebug(true);
     }
 
     @Override