Merge branch 'fix/link-invites' into 'master'

fmasa · fmasa · commit 733ea173f9c6 · 2020-06-20T23:34:37.000Z
Oprava odkazů s pozvánkou

See merge request fmasa/pv239-project!65
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
                 <action android:name="android.intent.action.VIEW"/>
                 <category android:name="android.intent.category.DEFAULT"/>
                 <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:host="wfrp.page.link" android:scheme="https"/>
+                <data android:host="dnd-master-58fca.web.app" android:pathPrefix="/app/" android:scheme="https"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/InvitationDialog.kt b/app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/InvitationDialog.kt
@@ -8,6 +8,7 @@ import android.view.View
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import com.fasterxml.jackson.databind.json.JsonMapper
+import com.google.firebase.dynamiclinks.ktx.androidParameters
 import com.google.firebase.dynamiclinks.ktx.dynamicLinks
 import com.google.firebase.dynamiclinks.ktx.shortLinkAsync
 import com.google.firebase.ktx.Firebase
@@ -54,7 +55,8 @@ class InvitationDialog(
         jsonInvitation: String
     ) {
         val link = Firebase.dynamicLinks.shortLinkAsync {
-            link = Uri.parse("https://play.google.com/store/apps/details?id=cz.frantisekmasa.dnd&invitation=$jsonInvitation")
+            link = Uri.parse("https://dnd-master-58fca.web.app/app/invitation?invitation=$jsonInvitation")
+            androidParameters {  }
             domainUriPrefix = "https://wfrp.page.link"
         }.await()
 
diff --git a/webapp/app.css b/webapp/app.css
@@ -84,6 +84,16 @@ body {
     color: #000;
 }
 
+.main-screenshot {
+    width: 30%;
+    float: left;
+    margin-right: 16px;
+}
+
+.clear {
+    clear: both;
+}
+
 @media (max-width: 600px) {
     body, #message {
         margin-top: 0;
diff --git a/webapp/app/invitation.html b/webapp/app/invitation.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Privacy Policy</title>
+
+    <link rel="stylesheet" href="/app.css">
+</head>
+<body>
+<div id="header">
+    <h1>WFRP Master</h1>
+</div>
+<div id="message">
+    <img src="/screenshot.png" alt="Screenshot of WFRP Master" class="main-screenshot">
+    <h1>Invitation</h1>
+    <p>You have been invited to WFRP Master party.</p>
+    <p>Open this page on your Android device to join it.</p>
+    <a href="https://play.google.com/store/apps/details?id=cz.frantisekmasa.dnd&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1"><img
+            alt="Get it on Google Play"
+            width="200"
+            src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"/></a>
+    <div class="clear"></div>
+</div>
+<div id="footer">
+    <p>WFRP Master</p>
+    <p>Google Play and the Google Play logo are trademarks of Google LLC.</p>
+</div>
+</body>
+</html>
diff --git a/webapp/screenshot.png b/webapp/screenshot.png
