diff --git a/android/assets/text/application/application_cs.properties b/android/assets/text/application/application_cs.properties index ed12202b14608fa567b26a390c8181efea3bbaa2..b2736103a895c2f867b8981730fe58910d6e3ac9 100644 --- a/android/assets/text/application/application_cs.properties +++ b/android/assets/text/application/application_cs.properties @@ -229,6 +229,6 @@ sync_request_button=Synchronizovat uĹľivatele sync_request_wrong_id=Ĺ patnÄ› zadanĂ˝ kĂłd. sync_request_error=Synchronizace se nezdaĹ™ila, zkuste to prosĂm pozdÄ›ji. sync_qr_request_button=Synchronizovat uĹľivatele (QR) -sync_qr_request_info_dialog_text = UmĂstÄ›te kameru tak, aby QR Code byl uvnitĹ™ lupy +sync_qr_request_info_dialog_text = UmĂstÄ›te kameru tak, aby QR Code byl uprostĹ™ed obrazovky. sync_qr_request_on_decoded_dialog_text = DekĂłdovaná zpráva\: diff --git a/android/assets/text/application/application_de.properties b/android/assets/text/application/application_de.properties index 59d1ab16ac2844752e4788c39fc7ecbc4206cb4a..c9fc19a9efc74a09e715ef63eabb773e369549c8 100644 --- a/android/assets/text/application/application_de.properties +++ b/android/assets/text/application/application_de.properties @@ -229,7 +229,7 @@ sync_request_button=Account synchronisieren sync_request_wrong_id=Falsch geschriebener Code. sync_request_error=Die synchronisierung ist fehlgeschlagen, bitte versuche es später noch einmal. sync_qr_request_button=Account synchronisieren (QR) -sync_qr_request_info_dialog_text=Positionieren Sie die Kamera so, dass der QR-Code innerhalb der Lupe ist. +sync_qr_request_info_dialog_text=Positionieren Sie die Kamera so, dass der QR-Code innerhalb der Mitte des Bildschirms. sync_qr_request_on_decoded_dialog_text=Die decodierte Nachricht\: diff --git a/android/assets/text/application/application_sk.properties b/android/assets/text/application/application_sk.properties index 193b6428bbd178b021798af023b654f280f59354..83611a7590203e329e4fdd876900764f0246f2bc 100644 --- a/android/assets/text/application/application_sk.properties +++ b/android/assets/text/application/application_sk.properties @@ -231,6 +231,6 @@ sync_request_button=SynchronizovaĹĄ uĹľĂvateÄľa sync_request_wrong_id=Zle zadanĂ˝ kĂłd. sync_request_error=Synchronizácia sa nepodarila, skĂşste to prosĂm neskĂ´r. sync_qr_request_button=SynchronizovaĹĄ uĹľĂvateÄľa (QR) -sync_qr_request_info_dialog_text=Umiestnite kameru tak, aby bol QR kĂłd vo vnĂştri lupy. +sync_qr_request_info_dialog_text=Umiestnite kameru tak, aby bol QR kĂłd uprostred obrazovky. sync_qr_request_on_decoded_dialog_text=DekĂłdovanĂ˝ obsah\: diff --git a/core/src/cz/nic/tablexia/menu/user/UserMenu.java b/core/src/cz/nic/tablexia/menu/user/UserMenu.java index eeb054ddaec965af9d94162c227fe5f93e4a42f0..b6f66766e1ef91211e71636cc06856d8d64c34ad 100644 --- a/core/src/cz/nic/tablexia/menu/user/UserMenu.java +++ b/core/src/cz/nic/tablexia/menu/user/UserMenu.java @@ -222,7 +222,30 @@ public class UserMenu extends AbstractMenu { qrCodeSync.addListener(new ClickListenerWithSound() { @Override public void onClick(InputEvent event, float x, float y) { - qrCodeSync.performAction(); + TablexiaComponentDialogFactory.getInstance().createDialog( + new CenterPositionDialogComponent(), + new DimmerDialogComponent(), + new ViewportMaximumSizeComponent(), + new AdaptiveSizeDialogComponent(), + new ResizableSpaceContentDialogComponent(), + new TextContentDialogComponent(ApplicationTextManager.getInstance().getText(ApplicationTextManager.ApplicationTextsAssets.SYNC_QR_REQUEST_INFO_DIALOG_TEXT)), + new ResizableSpaceContentDialogComponent(), + new TwoButtonContentDialogComponent(ApplicationTextManager.getInstance().getText(ApplicationTextManager.ApplicationTextsAssets.SYSTEM_BACK), + ApplicationTextManager.getInstance().getText(ApplicationTextManager.ApplicationTextsAssets.SYSTEM_PROCEED), + StandardTablexiaButton.TablexiaButtonType.RED, StandardTablexiaButton.TablexiaButtonType.GREEN, null, + new ClickListener() { + @Override + public void clicked(InputEvent event, float x, float y) { + qrCodeSync.performAction(); + } + }), + new AlertOnShowDialogComponent(), + new AdaptiveSizeDialogComponent(), + new CenterPositionDialogComponent(), + new BackButtonHideComponent() + + ).show(SYNC_REQUEST_DIALOG_WIDTH,SYNC_REQUEST_DIALOG_HEIGHT); + } }); menuItemsLayout.addActor(qrCodeSync);