/get: Support Android Direct .apk

mytonwalletorg · Mar 21, 2024 · 784a8e9 · 784a8e9
1 parent b83cb0b
commit 784a8e9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/public/get/unsupported.html → public/get/android.html b/public/get/unsupported.html → public/get/android.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>MyTonWallet Desktop</title>
+    <title>MyTonWallet for Android</title>
     <script src="./index.js"></script>
     <link rel="stylesheet" href="./index.css">
 </head>
@@ -12,10 +12,11 @@
     <div class="logo-container">
         <div class="logo mytonwallet-logo"></div>
     </div>
-    <h1>MyTonWallet for Desktop</h1>
-    <div class="info">Open this page from Mac, PC or Linux<br/>to install MyTonWallet.</div>
-    <a href="javascript:redirectToWeb();" class="download-btn single">Open Web Version</a>
+    <h1>MyTonWallet for Android</h1>
+    <a href="javascript:redirectToStore('Android');" class="download-btn single">Download from Google Play</a>
+    <a href="javascript:downloadAndroidDirect();" class="download-btn single">Download MyTonWallet.apk</a>
     <div class="footer">
+        <div class="version">&nbsp;</div>
         <a href="javascript:redirectToFullList();">Other platforms</a>
         · <a href="https://mytonwallet.io">mytonwallet.io</a>
     </div>

diff --git a/public/get/connect.html b/public/get/connect.html
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>MyTonWallet Desktop</title>
+    <title>MyTonWallet Connect</title>
     <link rel="stylesheet" href="./index.css">
 </head>
 <body>

diff --git a/public/get/index.css b/public/get/index.css
@@ -172,6 +172,10 @@ body {
   margin: 32px 0;
 }
 
+.download-btn.single ~ .download-btn.single {
+  margin-top: -12px;
+}
+
 .footer {
   font-size: small;
   color: #A9A9A9;

diff --git a/public/get/index.js b/public/get/index.js
@@ -1,17 +1,19 @@
 const REPO = 'mytonwalletorg/mytonwallet';
 const LATEST_RELEASE_API_URL = `https://api.github.com/repos/${REPO}/releases/latest`;
 const LATEST_RELEASE_WEB_URL = `https://github.com/${REPO}/releases/latest`;
+const LATEST_RELEASE_DOWNLOAD_URL = `https://github.com/${REPO}/releases/download/v%VERSION%`;
 const WEB_APP_URL = '/';
 const MOBILE_URLS = {
   ios: 'https://apps.apple.com/ru/app/mytonwallet-anyway-ton-wallet/id6464677844',
   android: 'https://play.google.com/store/apps/details?id=org.mytonwallet.app',
+  androidDirect: `${LATEST_RELEASE_DOWNLOAD_URL}/MyTonWallet.apk`,
 };
 
 const platform = getPlatform();
-const currentPage = location.href.includes('mac.html')
-  ? 'mac'
-  : location.href.includes('unsupported.html')
-    ? 'unsupported'
+const currentPage = location.href.includes('/android')
+  ? 'android'
+  : location.href.includes('/mac')
+    ? 'mac'
     : 'index';
 
 // Request the latest release information from GitHub
@@ -52,20 +54,17 @@ const packagesPromise = fetch(LATEST_RELEASE_API_URL)
   });
 
 (function init() {
-  if (['Windows', 'Linux', 'iOS', 'Android'].includes(platform)) {
-    if (currentPage === 'index') {
+  if (currentPage === 'index') {
+    if (['Windows', 'Linux', 'iOS'].includes(platform)) {
       setupDownloadButton();
-      setupVersion();
-    }
-  } else if (platform === 'macOS') {
-    if (currentPage !== 'mac') {
+    } else if (platform === 'Android') {
+      redirectToAndroid();
+    } else if (platform === 'macOS') {
       redirectToMac();
-    } else {
-      setupVersion();
     }
-  } else if (currentPage !== 'unsupported') {
-    redirectToUnsupported();
   }
+
+  setupVersion();
 }());
 
 function getPlatform() {
@@ -122,12 +121,12 @@ function setupVersion() {
   });
 }
 
-function redirectToMac() {
-  location.href = './mac.html';
+function redirectToAndroid() {
+  location.href = './android';
 }
 
-function redirectToUnsupported() {
-  location.href = './unsupported.html';
+function redirectToMac() {
+  location.href = './mac';
 }
 
 function redirectToWeb() {
@@ -147,15 +146,21 @@ function downloadDefault() {
     download('win');
   } else if (platform === 'Linux') {
     download('linux');
+  } else if (platform === 'Android') {
+    redirectToAndroid();
   } else if (platform === 'macOS') {
     redirectToMac();
   } else if (platform === 'iOS' || platform === 'Android') {
     redirectToStore(platform);
-  } else {
-    redirectToUnsupported();
   }
 }
 
+function downloadAndroidDirect() {
+  packagesPromise.then((packages) => {
+    location.href = MOBILE_URLS.androidDirect.replace('%VERSION%', packages.$version);
+  });
+}
+
 function download(platformKey) {
   packagesPromise.then((packages) => {
     location.href = packages[platformKey];