From 4030acbd7540b893c290af935cb6159944f7090b Mon Sep 17 00:00:00 2001 From: Phinner <62483793+Phinner@users.noreply.github.com> Date: Sat, 13 Aug 2022 19:52:46 +0200 Subject: [PATCH] Allow servers to send openable links to players (#7351) * commitin' * Update core/assets/bundles/bundle.properties Co-authored-by: Anuken * Update bundle_fr.properties * s p a c e Co-authored-by: Anuken --- core/assets/bundles/bundle.properties | 1 + core/assets/bundles/bundle_fr.properties | 1 + core/src/mindustry/ui/Menus.java | 7 +++++++ 3 files changed, 9 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 58112b3bc5..bc9f237e28 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -14,6 +14,7 @@ link.f-droid.description = F-Droid listing link.wiki.description = Official Mindustry wiki link.suggestions.description = Suggest new features link.bug.description = Found one? Report it here +linkopen = This server has sent you a link. Are you sure you want to open it?\n\n[sky]{0} linkfail = Failed to open link!\nThe URL has been copied to your clipboard. screenshot = Screenshot saved to {0} screenshot.invalid = Map too large, potentially not enough memory for screenshot. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index d3c80d3fd6..5f3322af07 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -14,6 +14,7 @@ link.f-droid.description = Page F-Droid du jeu link.wiki.description = Wiki officiel de Mindustry link.suggestions.description = Suggérez de nouvelles fonctionnalités link.bug.description = Vous avez trouvé un bug ? Reportez-le ici +linkopen = Ce serveur vous a envoyé un lien. Êtes-vous certain de vouloir l’ouvrir ?\n\n[sky]{0} linkfail = L'ouverture du lien a échouée ! \nL'URL a été copiée dans votre presse-papier. screenshot = Capture d'écran sauvegardée dans {0} screenshot.invalid = Carte trop grande, potentiellement pas assez de mémoire pour la capture d'écran. diff --git a/core/src/mindustry/ui/Menus.java b/core/src/mindustry/ui/Menus.java index 7d4d601a8d..96e2ffdba2 100644 --- a/core/src/mindustry/ui/Menus.java +++ b/core/src/mindustry/ui/Menus.java @@ -111,6 +111,13 @@ public class Menus{ ui.hudfrag.showToast(Fonts.getGlyph(Fonts.icon, (char)unicode), text); } + @Remote(variants = Variant.both) + public static void openURI(String uri){ + if(uri == null) return; + + ui.showConfirm(Core.bundle.format("linkopen", uri), () -> Core.app.openURI(uri)); + } + //internal use only @Remote public static void removeWorldLabel(int id){