Skip to content
Snippets Groups Projects
Commit 03a9268b authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko
Browse files

#59 Text paths moved to constants. Code optimization.

parent b75157ad
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 83 additions and 49 deletions
core/assets/common/screen/about/closebutton_pressed.png 0 → 100644
+ 0
− 0
View file @ 03a9268b
core/assets/common/screen/about/closebutton_pressed.png

4.23 KiB

core/assets/common/screen/about/closebutton_unpressed.png 0 → 100644
+ 0
− 0
View file @ 03a9268b
core/assets/common/screen/about/closebutton_unpressed.png

4.85 KiB

core/assets/common/screen/about/logo_nic.png 0 → 100644
+ 0
− 0
View file @ 03a9268b
core/assets/common/screen/about/logo_nic.png

4.74 KiB

core/assets/common/screen/about/tablexia.png 0 → 100644
+ 0
− 0
View file @ 03a9268b
core/assets/common/screen/about/tablexia.png

23.1 KiB

core/src/cz/nic/tablexia/screen/about/AboutScreen.java
+ 28
− 29
View file @ 03a9268b
......@@ -14,7 +14,6 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align;
import java.util.List;
import java.util.Map;
......@@ -23,10 +22,9 @@ import cz.nic.tablexia.screen.AbstractTablexiaScreen;
import cz.nic.tablexia.screen.about.assets.AboutAssets;
public class AboutScreen extends AbstractTablexiaScreen<Void> {
private static final Color BACKGROUND_COLOR = new Color(((float) 248 / (float) 255), ((float) 236 / (float) 255), ((float) 212 / (float) 255), 1);
private static final Color BACKGROUND_COLOR = new Color(0.972f, 0.972f, 0.972f, 1);
private static final Color DEFAULT_FONT_COLOR = Color.BLACK;
private static final boolean SHOW_BOUNDING_BOXES = TablexiaSettings.getInstance().isShowBoundingBoxes();
private static final float SMALL_FONT_SCALE = 0.5f;
private static final float DEFAULT_FONT_SCALE = 0.7f;
private static final float BIG_FONT_SCALE = 1.0f;
......@@ -35,7 +33,6 @@ public class AboutScreen extends AbstractTablexiaScreen<Void> {
private static final int LOGO_CZ_NIC_MAX_HEIGHT = 20;
private static final int CONTENT_PAD = 35;
private static final int IMAGE_PAD = 15;
private static final int BUTTON_PAD_LEFT = 25;
private static final int BUTTON_PAD_BOTTOM = 25;
private static final int CLOSE_BUTTON_SIZE = 35;
private static final int DEFAULT_FONT_PAD = 5;
......@@ -76,50 +73,52 @@ public class AboutScreen extends AbstractTablexiaScreen<Void> {
addImageToContainer(AboutAssets.LOGO_TABLEXIA, LOGO_TABLEXIA_MAX_HEIGHT, Links.TABLEXIA);
addDefaultTextToContainer("about_info_1");
addDefaultTextToContainer(AboutAssets.ABOUT_INFO_1);
//add cz.nic logo
addImageToContainer(AboutAssets.LOGO_NIC, LOGO_CZ_NIC_MAX_HEIGHT, Links.NIC_CZ);
//add text from properties
addDefaultTextToContainer("about_info_2");
addDefaultTextToContainer(AboutAssets.ABOUT_INFO_2);
addDefaultTextToContainer(AboutAssets.ABOUT_INFO_3);
addDefaultTextToContainer("about_info_3");
addBigBoldTextToContainer(AboutAssets.PARAGRAPH_1);
addBigBoldTextToContainer("paragraph_1");
addBoldTextToContainer(AboutAssets.PROJECT_MANAGERS);
addDefaultTextToContainer(AboutAssets.PROJECT_MANAGERS_DETAILS);
addBoldTextToContainer("project_managers");
addDefaultTextToContainer("project_managers_details");
addBoldTextToContainer(AboutAssets.PSYCHOLOGICAL_CONCEPT);
addDefaultTextToContainer(AboutAssets.PSYCHOLOGICAL_CONCEPT_DETAILS);
addBoldTextToContainer("psychological_concept");
addDefaultTextToContainer("psychological_concept_details");
addBoldTextToContainer(AboutAssets.DEVELOPERS);
addDefaultTextToContainer(AboutAssets.DEVELOPERS_DETAILS);
addBoldTextToContainer("developers");
addDefaultTextToContainer("developers_details");
addBoldTextToContainer(AboutAssets.GAME_CONCEPT);
addDefaultTextToContainer(AboutAssets.GAME_CONCEPT_DETAILS);
addBoldTextToContainer("game_concept");
addDefaultTextToContainer("game_concept_details");
addBoldTextToContainer(AboutAssets.ILLUSTRATORS);
addDefaultTextToContainer(AboutAssets.ILLUSTRATORS_DETAILS);
addBoldTextToContainer("illustrators");
addDefaultTextToContainer("illustrators_details");
addBigBoldTextToContainer(AboutAssets.PARAGRAPH_2);
addDefaultTextToContainer(AboutAssets.PARAGRAPH_2_DETAILS);
addBigBoldTextToContainer("paragraph_2");
addDefaultTextToContainer("paragraph_2_details");
addBigBoldTextToContainer(AboutAssets.PARAGRAPH_3);
addDefaultTextToContainer(AboutAssets.PARAGRAPH_3_DETAILS_1_1);
addBigBoldTextToContainer("paragraph_3");
addDefaultTextToContainer("paragraph_3_details_1_1");
addLabelLink(Links.TABLEXIA_GIT);
addDefaultTextToContainer("paragraph_3_details_1_2");
addDefaultTextToContainer("paragraph_3_details_2");
addDefaultTextToContainer(AboutAssets.PARAGRAPH_3_DETAILS_1_2);
addDefaultTextToContainer(AboutAssets.PARAGRAPH_3_DETAILS_2);
content.add(createTableWithLibrariesLinks()).width(contentWidth);
content.row();
addBigBoldTextToContainer("paragraph_4");
addDefaultTextToContainer("paragraph_4_details");
addBigBoldTextToContainer(AboutAssets.PARAGRAPH_4);
addDefaultTextToContainer(AboutAssets.PARAGRAPH_4_DETAILS);
addDefaultTextToContainer("about_info_4");
addDefaultTextToContainer(AboutAssets.ABOUT_INFO_4);
addBigLabelLink(Links.TABLEXIA);
Button closeButton = new Button(new TextureRegionDrawable(getScreenTextureRegion(AboutAssets.CLOSEBUTTON_UNPRESSED)), new TextureRegionDrawable(getScreenTextureRegion(AboutAssets.CLOSEBUTTON_PRESSED)));
......@@ -181,7 +180,7 @@ public class AboutScreen extends AbstractTablexiaScreen<Void> {
private Table createTableWithLibrariesLinks() {
Table linksTable = new Table();
List<Links> links = Links.getGroupLinks(LinkGroups.LINK_GROUP_LIBRARY);
List<Links> links = Links.getGroupLinks(LinkGroups.LIBRARY);
Label label;
for (Links link : links) {
label = (createLabelWithLink(link, false));
......@@ -259,7 +258,7 @@ public class AboutScreen extends AbstractTablexiaScreen<Void> {
}
class LabelClickListener extends ClickListener {
private static class LabelClickListener extends ClickListener {
@Override
public void clicked(InputEvent event, float x, float y) {
......
core/src/cz/nic/tablexia/screen/about/LinkGroups.java
+ 5
− 3
View file @ 03a9268b
package cz.nic.tablexia.screen.about;
public class LinkGroups {
public static final int LINK_GROUP_OTHER = 0;
public static final int LINK_GROUP_LIBRARY = 1;
public enum LinkGroups {
OTHER,
LIBRARY;
}
core/src/cz/nic/tablexia/screen/about/Links.java
+ 17
− 17
View file @ 03a9268b
......@@ -6,23 +6,23 @@ import java.util.List;
public enum Links {
NIC_CZ("CZ.NIC", "http://www.nic.cz", LinkGroups.LINK_GROUP_OTHER),
TABLEXIA("www.tablexia.cz", "http://tablexia.cz", LinkGroups.LINK_GROUP_OTHER),
TABLEXIA_GIT("GitLab CZ.NIC","https://gitlab.labs.nic.cz/labs/tablexia/tree/master", LinkGroups.LINK_GROUP_OTHER),
AND_ENGINE ("AndEngine,", "http://www.andengine.org/", LinkGroups.LINK_GROUP_LIBRARY),
ACTIVE_ANDROID("ActiveAndroid,", "http://www.activeandroid.com/", LinkGroups.LINK_GROUP_LIBRARY),
A_CHART_ENGINE("AChartEngine,","http://www.achartengine.org/" , LinkGroups.LINK_GROUP_LIBRARY),
GOOGLE_GSON("google-gson,", "http://code.google.com/p/google-gson/", LinkGroups.LINK_GROUP_LIBRARY),
ROBO_GUICE("robo-guice,", "https://github.com/roboguice/roboguice" , LinkGroups.LINK_GROUP_LIBRARY),
GOOGLE_GUICE("google-guice,", "http://code.google.com/p/google-guice/", LinkGroups.LINK_GROUP_LIBRARY),
SVG_ANDROID("svg-android", "http://code.google.com/p/svg-android/", LinkGroups.LINK_GROUP_LIBRARY);
NIC_CZ("CZ.NIC", "http://www.nic.cz", LinkGroups.OTHER),
TABLEXIA("www.tablexia.cz", "http://tablexia.cz", LinkGroups.OTHER),
TABLEXIA_GIT("GitLab CZ.NIC", "https://gitlab.labs.nic.cz/labs/tablexia/tree/master", LinkGroups.OTHER),
AND_ENGINE("AndEngine,", "http://www.andengine.org/", LinkGroups.LIBRARY),
ACTIVE_ANDROID("ActiveAndroid,", "http://www.activeandroid.com/", LinkGroups.LIBRARY),
A_CHART_ENGINE("AChartEngine,", "http://www.achartengine.org/", LinkGroups.LIBRARY),
GOOGLE_GSON("google-gson,", "http://code.google.com/p/google-gson/", LinkGroups.LIBRARY),
ROBO_GUICE("robo-guice,", "https://github.com/roboguice/roboguice", LinkGroups.LIBRARY),
GOOGLE_GUICE("google-guice,", "http://code.google.com/p/google-guice/", LinkGroups.LIBRARY),
SVG_ANDROID("svg-android", "http://code.google.com/p/svg-android/", LinkGroups.LIBRARY);
private String linkName;
private String linkAddress;
private int linkGroup;
private LinkGroups linkGroup;
Links(String linkName, String linkAddress, int linkGroup) {
Links(String linkName, String linkAddress, LinkGroups linkGroup) {
this.linkName = linkName;
this.linkAddress = linkAddress;
this.linkGroup = linkGroup;
......@@ -36,17 +36,17 @@ public enum Links {
return linkName;
}
public int getLinkGroup() {
public LinkGroups getLinkGroup() {
return linkGroup;
}
public static List<Links> getGroupLinks(int group){
public static List<Links> getGroupLinks(LinkGroups group) {
List<Links> linksList = new ArrayList<Links>();
for(Links link : Links.values()){
if (link.getLinkGroup()==group){
for (Links link : Links.values()) {
if (link.getLinkGroup() == group) {
linksList.add(link);
}
}
return linksList;
return linksList;
}
}
core/src/cz/nic/tablexia/screen/about/assets/AboutAssets.java
+ 33
− 0
View file @ 03a9268b
......@@ -4,9 +4,42 @@ package cz.nic.tablexia.screen.about.assets;
* Created by vitaliy on 6.11.15.
*/
public class AboutAssets {
/*
Images
*/
public static final String LOGO_TABLEXIA = "tablexia";
public static final String LOGO_NIC = "logo_nic";
public static final String CLOSEBUTTON_PRESSED = "closebutton_pressed";
public static final String CLOSEBUTTON_UNPRESSED = "closebutton_unpressed";
/*
Text from properties
*/
public static final String ABOUT_INFO_1 = "about_info_1";
public static final String ABOUT_INFO_2 = "about_info_2";
public static final String ABOUT_INFO_3 = "about_info_3";
public static final String ABOUT_INFO_4 = "about_info_4";
public static final String PARAGRAPH_1 = "paragraph_1";
public static final String PARAGRAPH_2 = "paragraph_2";
public static final String PARAGRAPH_2_DETAILS = "paragraph_2_details";
public static final String PARAGRAPH_3 = "paragraph_3";
public static final String PARAGRAPH_3_DETAILS_1_1 = "paragraph_3_details_1_1";
public static final String PARAGRAPH_3_DETAILS_1_2 = "paragraph_3_details_1_2";
public static final String PARAGRAPH_3_DETAILS_2 = "paragraph_3_details_2";
public static final String PARAGRAPH_4 = "paragraph_4";
public static final String PARAGRAPH_4_DETAILS = "paragraph_4_details";
public static final String PROJECT_MANAGERS = "project_managers";
public static final String PROJECT_MANAGERS_DETAILS = "project_managers_details";
public static final String PSYCHOLOGICAL_CONCEPT = "psychological_concept";
public static final String PSYCHOLOGICAL_CONCEPT_DETAILS = "psychological_concept_details";
public static final String DEVELOPERS = "developers";
public static final String GAME_CONCEPT = "game_concept";
public static final String GAME_CONCEPT_DETAILS = "game_concept_details";
public static final String DEVELOPERS_DETAILS = "developers_details";
public static final String ILLUSTRATORS = "illustrators";
public static final String ILLUSTRATORS_DETAILS = "illustrators_details";
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment