diff --git a/android/assets/text/application/application_sk.properties b/android/assets/text/application/application_sk.properties index 7b12081d7b19c8007cb46119a59044e45f32fe3c..4e9a8c79cbe485f7933f13960564cec43e8b1914 100644 --- a/android/assets/text/application/application_sk.properties +++ b/android/assets/text/application/application_sk.properties @@ -48,7 +48,7 @@ gamedifficulty_easy=Ä˝ahká gamedifficulty_medium=Stredná gamedifficulty_hard=ŤaĹľká -victoryscreen_button_replay=Hráť znovu +victoryscreen_button_replay=HraĹĄ znovu victoryscreen_button_changegame=InĂş hru victoryscreen_text_tutorial=Gratulujem! A teraz to skĂşs sám… victoryscreen_new_trophy=ZĂskavaš trofej! @@ -67,11 +67,11 @@ game_robbery_preloader=PreÄŤĂtaj a zapamätaj si pravidlo, podÄľa ktorĂ©ho spoz game_kidnapping_title=Ăšnos game_kidnapping_description=PrecviÄŤovanie sluchovej pamäti game_kidnapping_preloader1=VypoÄŤuj a\u00A0zapamätaj si zvuk, ktorĂ˝ si poÄŤul na kriĹľovatke. -game_kidnapping_preloader2=Potom si vypoÄŤuj zvuky okolitĂ˝ch ulic a\u00A0urÄŤi, ktorĂş ste prešli. -game_kidnapping_preloader3=So slĂşchatkami budeš zvuky poÄŤuĹĄ lepšie. +game_kidnapping_preloader2=Potom si vypoÄŤuj zvuky okolitĂ˝ch ulĂc a\u00A0urÄŤi, ktorĂş ste prešli. +game_kidnapping_preloader3=So slĂşchadlami budeš zvuky poÄŤuĹĄ lepšie. game_pursuit_title=Prenasledovanie game_pursuit_description=PrecviÄŤovanie priestorovej orientácie -game_pursuit_preloader=Zostav mapu premiestĹovania a\u00A0otáčania jednotlivĂ˝ch dielcov. +game_pursuit_preloader=Zostav mapu priemiestĹovaniam a\u00A0otáčaniam jednotlivĂ˝ch dielcov. game_night_watch_title=Hliadka game_night_watch_description=PrecviÄŤovanie zrakovej pamäti game_night_watch_preloader=Dávaj pozor, ktorĂ© okná sa po zotmenĂ rozsvietia a\u00A0o\u00A0ktorej.\nPo svitanĂ nastav na hodinách ÄŤas a\u00A0oznaÄŤ okná, ktorĂ© boli rozsvietenĂ©. @@ -113,7 +113,7 @@ kidnapping_1_finished=NastraĹľenĂ© ucho kidnapping_1_finished_description=Za dohranie prvej hry kidnapping_5_finished=RysĂ sluch kidnapping_5_finished_description=Za odohranie piatich hier -kidnapping_10_finished=SousedÄŤino ucho +kidnapping_10_finished=Susedkyno ucho kidnapping_10_finished_description=Za 10 dohranĂ˝ch her kidnapping_1_limit=Spiaci netopier kidnapping_1_limit_description=Za tri poháre na strednĂş ĂşroveĹ diff --git a/android/assets/text/game/robbery/robbery_sk.properties b/android/assets/text/game/robbery/robbery_sk.properties index 283f18ce62fc44d08e627ef6803034b607003217..4f6f6472927313e0c8e740b1d53bad094c9e5ac4 100644 --- a/android/assets/text/game/robbery/robbery_sk.properties +++ b/android/assets/text/game/robbery/robbery_sk.properties @@ -46,14 +46,14 @@ game_robbery_attribute_mhairattribute=Ă© krátke vlasy game_robbery_attribute_fbeadsattribute=Ă© korále game_robbery_attribute_fscarfattribute=Ăş dámskĂş šatku game_robbery_attribute_mscarfattribute=Ă˝ pánskĂ˝ šál -game_robbery_attribute_mtieattribute=ou kravatu +game_robbery_attribute_mtieattribute=Ăş kravatu game_robbery_rule_ca0cc0t=Ak prĂde ÄŤlovek, ktorĂ˝ bude maĹĄ na sebe [BLACK]nejakĂ© {0}Ă©[] obleÄŤenie a\u00A0po Ĺom ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{1}{2}[], tak [BLACK]ÄŹalšà v poradĂ je zlodej[]. game_robbery_rule_cc0cc0t=Ak prĂde ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{0}{1}[] a [BLACK]po Ĺom[] ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{2}{3}[], tak [BLACK]ÄŹalšà v poradĂ[] je zlodej. game_robbery_rule_cccc=Zlodej bude maĹĄ [BLACK]{0}{1}[] a [BLACK]{2}{3}[]. -game_robbery_rule_cacc=Zlodej bude maĹĄ na sebe nieÄŤo [BLACK]{0}Ă©ho[] a\u00A0bude maĹĄ [BLACK]{1}{2}[]. -game_robbery_rule_caca=Zlodej bude maĹĄ na sebe nieÄŤo [BLACK]{0}Ă©ho[] a\u00A0nieÄŤo [BLACK]{1}Ă©ho[]. +game_robbery_rule_cacc=Zlodej bude maĹĄ na sebe nieÄŤo [BLACK]{0}Ă©[] a\u00A0bude maĹĄ [BLACK]{1}{2}[]. +game_robbery_rule_caca=Zlodej bude maĹĄ na sebe nieÄŤo [BLACK]{0}Ă©[] a\u00A0nieÄŤo [BLACK]{1}Ă©[]. game_robbery_rule_bx0bx=Zlodej bude maĹĄ [BLACK]rovnakĂ˝ {0}[] ako ÄŤlovek, ktorĂ˝ prĂde [BLACK]pred nĂm[]. game_robbery_rule_bc1bc=Zlodej bude maĹĄ [BLACK]rovnak{0}[] ako ÄŤlovek, ktorĂ˝ prĂde [BLACK]ob\u00A0jednĂ©ho ÄŤloveka pred nĂm[]. game_robbery_rule_cc0notcc=Zlodej nebude maĹĄ [BLACK]{0}{1}[] a\u00A0ÄŤlovek, ktorĂ˝ prĂde [BLACK]pred nĂm[], bude maĹĄ na sebe [BLACK]{2}{3}[]. @@ -67,7 +67,7 @@ game_robbery_rule_cccccc=Zlodej bude maĹĄ [BLACK]{0}{1}[], [BLACK]{2}{3}[] a [BL game_robbery_rule_cc2cc=Zlodej bude maĹĄ [BLACK]{0}{1}[] a\u00A0prĂde [BLACK]ob dva lidi[] po ÄŤloveku, kterĂ˝ bude maĹĄ [BLACK]{2}{3}[]. game_robbery_rule_cc0notcc0t=Ak prĂde ÄŤlovek, kterĂ˝ bude maĹĄ [BLACK]{0}{1}[] a [BLACK]po Ĺom[] ÄŤlovek, kterĂ˝ [BLACK]nebude[] maĹĄ [BLACK]{2}{3}[], tak [BLACK]ÄŹalšà v poradĂ[] je zlodej. -game_robbery_rule_cc0notca0t=Ak prĂde ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{0}{1}[] a [BLACK]po Ĺom[] ÄŤlovek, ktorĂ˝ [BLACK]nebude[] maĹĄ niÄŤ [BLACK]{2}Ă©ho[], tak [BLACK]ÄŹalšà v poradĂ[] je zlodej. +game_robbery_rule_cc0notca0t=Ak prĂde ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{0}{1}[] a [BLACK]po Ĺom[] ÄŤlovek, ktorĂ˝ [BLACK]nebude[] maĹĄ niÄŤ [BLACK]{2}Ă©[], tak [BLACK]ÄŹalšà v poradĂ[] je zlodej. game_robbery_rule_cc0cc0cc=Ak prĂde ÄŤlovek, ktorĂ˝ bude maĹĄ [BLACK]{0}{1}[] a [BLACK]po Ĺom[] ÄŤlovek, kterĂ˝ bude maĹĄ [BLACK]{2}{3}[], tak [BLACK]ÄŹalšà v poradĂ[] je zlodej, ak má na sebe [BLACK]{4}{5}[]. game_robbery_rule_ccccnotcc=Zlodej bude maĹĄ [BLACK]{0}{1}[] a [BLACK]{2}{3}[] a [BLACK]nebude[] maĹĄ [BLACK]{4}{5}[]. game_robbery_rule_bx1bx=Zlodej bude maĹĄ [BLACK]rovnakĂ˝ {0}[] ako ÄŤlovek, ktorĂ˝ prĂde [BLACK]ob jednĂ©ho ÄŤloveka pred nĂm[]. diff --git a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java index 0c874fd0e4a25a8852371f8507d761c0df094369..58887265a7cfae5f39bc9ad55491eff719e14c93 100644 --- a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java +++ b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java @@ -68,6 +68,7 @@ import cz.nic.tablexia.util.ui.dialog.TablexiaComponentDialogFactory; import cz.nic.tablexia.util.ui.dialog.components.AdaptiveSizeDialogComponent; import cz.nic.tablexia.util.ui.dialog.components.CenterPositionDialogComponent; import cz.nic.tablexia.util.ui.dialog.components.DimmerDialogComponent; +import cz.nic.tablexia.util.ui.dialog.components.DividerContentDialogComponent; import cz.nic.tablexia.util.ui.dialog.components.FixedSpaceContentDialogComponent; import cz.nic.tablexia.util.ui.dialog.components.ResizableSpaceContentDialogComponent; import cz.nic.tablexia.util.ui.dialog.components.SpeechDialogComponent; @@ -80,9 +81,10 @@ import cz.nic.tablexia.util.ui.dialog.components.ViewportMaximumSizeComponent; public class FormScreen extends AbstractTablexiaScreen<Void> { //TODO - Get rid of all magic values and strings in the code (Use constants) - private static final Color TEXT_COLOR = Color.BLACK; + private static final Color TEXT_COLOR = Color.BLACK; private static final ApplicationFontManager.FontType_NEW TEXT_14 = ApplicationFontManager.FontType_NEW.REGULAR_14; private static final ApplicationFontManager.FontType_NEW TEXT_20 = ApplicationFontManager.FontType_NEW.REGULAR_20; + private static final ApplicationFontManager.FontType_NEW TEXT_26 = ApplicationFontManager.FontType_NEW.REGULAR_26; private static final int DEFAULT_USER_AGE = 10; private static final int MAX_USER_AGE = 99; @@ -286,7 +288,7 @@ public class FormScreen extends AbstractTablexiaScreen<Void> { // signature pen needs to be below pen and stamp signaturePane = new SignaturePane(); group.addActor(signaturePane); - signaturePane.setBounds(getSceneWidth() / 2, getSceneInnerHeight() * FormActorsLayout.SIGNATURE_PANE_Y, getSceneInnerHeight() / 2, getSceneInnerHeight() * FormActorsLayout.SIGNATURE_PANE_HEIGHT); + signaturePane.setBounds(getSceneWidth() * FormActorsLayout.SIGNATURE_PANE_X, getSceneInnerHeight() * FormActorsLayout.SIGNATURE_PANE_Y, getSceneWidth() * FormActorsLayout.SIGNATURE_PANE_WIDTH, getSceneInnerHeight() * FormActorsLayout.SIGNATURE_PANE_HEIGHT); signaturePane.setDebug(TablexiaSettings.getInstance().isShowBoundingBoxes()); @@ -571,6 +573,13 @@ public class FormScreen extends AbstractTablexiaScreen<Void> { adapters.add(new CenterPositionDialogComponent()); adapters.add(new DimmerDialogComponent(0.7f)); + //Signature title and spacers... + adapters.add(new FixedSpaceContentDialogComponent()); + adapters.add(new TextContentDialogComponent(getText(FormScreenAssets.TEXT_FORM_SIGNATURE), TEXT_26)); + adapters.add(new FixedSpaceContentDialogComponent()); + adapters.add(new DividerContentDialogComponent()); + adapters.add(new FixedSpaceContentDialogComponent()); + //Anonymous signature component adapters.add(new TablexiaDialogComponentAdapter() { //TODO 4 Desktop - Override sizeChanged?? Resize SignaturePane when resizing the window diff --git a/core/src/cz/nic/tablexia/screen/createuser/FormScreenAssets.java b/core/src/cz/nic/tablexia/screen/createuser/FormScreenAssets.java index edd99c107b4430e67a413ce8187b7e8110ceb00b..af10e03169fdc356c1bcd768c97ce0c1071a1b67 100644 --- a/core/src/cz/nic/tablexia/screen/createuser/FormScreenAssets.java +++ b/core/src/cz/nic/tablexia/screen/createuser/FormScreenAssets.java @@ -42,6 +42,7 @@ public class FormScreenAssets { public static final String TEXT_FORM_SIGN = "createuser_form_sign"; public static final String TEXT_FORM_AGE = "createuser_form_age"; public static final String TEXT_FORM_GENDER = "createuser_form_gender"; + public static final String TEXT_FORM_SIGNATURE = "createuser_form_signature"; ///// MUSIC ASSETS diff --git a/core/src/cz/nic/tablexia/screen/createuser/form/FormActorsLayout.java b/core/src/cz/nic/tablexia/screen/createuser/form/FormActorsLayout.java index 41d6a3aab9db91ce6bc6549b46fe6e7cdbcba022..9b44e408726074373c52df68ccd9c0e882fa1f41 100644 --- a/core/src/cz/nic/tablexia/screen/createuser/form/FormActorsLayout.java +++ b/core/src/cz/nic/tablexia/screen/createuser/form/FormActorsLayout.java @@ -34,8 +34,10 @@ public class FormActorsLayout { public static final float STAMP_X = -0.01f; public static final float STAMP_Y = -0.05f; + public static final float SIGNATURE_PANE_X = 0.53f; public static final float SIGNATURE_PANE_Y = 0.1f; - public static final float SIGNATURE_PANE_HEIGHT = 0.1f; + public static final float SIGNATURE_PANE_WIDTH = 0.2f; + public static final float SIGNATURE_PANE_HEIGHT = 0.12f; public static final float SWITCH_GENDER_SCALE = 0.8f; public static final float SWITCH_GENDER_X = 0.725f;