Merge pull request #788 from Adamant-im/dev

v4.10.0

Author: S-FrontendDev

.env

@@ -1,2 +1,4 @@
 VITE_I18N_LOCALE=en
 VITE_I18N_FALLBACK_LOCALE=en
+VITE_PUBLIC_PATH=
+VITE_ROUTER_HISTORY_MODE=

.github/workflows/capacitor-android.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - dev
+  workflow_dispatch:
 
 env:
   GH_TOKEN: ${{ secrets.github_token }}
@@ -13,7 +14,6 @@ env:
   ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
   ANDROID_KEYSTORE_ALIAS: ${{ secrets.ANDROID_KEYSTORE_ALIAS }}
   ANDROID_KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_ALIAS_PASSWORD }}
-  ANDROID_RELEASE_TYPE: 'AAB' # APK or AAB
 
 jobs:
   release:
@@ -23,15 +23,18 @@ jobs:
       - name: Checkout repository 🛎️
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK LTS
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
-          distribution: 'zulu'
+          java-version: '21'
+          distribution: 'jetbrains'
 
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
 
+      - name: Install ApkSigner
+        run: sudo apt install -y apksigner
+
       - name: Setup Node version 🍀
         uses: actions/setup-node@v4
         with:
@@ -51,21 +54,33 @@ jobs:
           base64 -d android/keystore.base64 > android/app.keystore
           rm android/keystore.base64
 
-      - name: Build and Sign Android App 🛠️
+      - name: Build and Sign Android App (APK) 🛠️
+        run: |
+          npx cap sync
+          npx cap build android \
+            --keystorepath $ANDROID_KEYSTORE_PATH \
+            --keystorepass $ANDROID_KEYSTORE_PASSWORD \
+            --keystorealias $ANDROID_KEYSTORE_ALIAS \
+            --keystorealiaspass $ANDROID_KEYSTORE_ALIAS_PASSWORD \
+            --androidreleasetype APK \
+            --signing-type apksigner
+
+      - name: Build and Sign Android App (AAB) 🛠️
         run: |
           npx cap sync
           npx cap build android \
             --keystorepath $ANDROID_KEYSTORE_PATH \
             --keystorepass $ANDROID_KEYSTORE_PASSWORD \
             --keystorealias $ANDROID_KEYSTORE_ALIAS \
             --keystorealiaspass $ANDROID_KEYSTORE_ALIAS_PASSWORD \
-            --androidreleasetype $ANDROID_RELEASE_TYPE
+            --androidreleasetype AAB
 
       - name: Save artifacts 💾
         uses: actions/upload-artifact@v4
         with:
           name: android-release-app
           path: |
+            android/app/build/outputs/apk/release/*
             android/app/build/outputs/bundle/release/*
 
       - name: Clean Keystore file 🧹

.github/workflows/github-pages.yml

@@ -0,0 +1,51 @@
+name: GitHub Pages
+on:
+  push:
+    branches:
+      - master
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Node version 🍀
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Configure GitHub Pages ⚙️
+        uses: actions/configure-pages@v5
+
+      - name: Install dependencies 📦
+        run: npm ci
+
+      - name: Build PWA 🛠️
+        run: |
+          npm run schema:generate
+          npm run build
+        env:
+          VITE_PUBLIC_PATH: ${{ github.event.repository.name }}
+          VITE_ROUTER_HISTORY_MODE: hash
+
+      - name: Upload artifacts 📁
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: dist
+
+      - name: Deploy to GitHub Pages 🚀
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/pwa-testnet.yml

@@ -0,0 +1,45 @@
+name: PWA Testnet Workflow
+
+on:
+  push:
+    branches:
+      - dev
+      - master
+
+env:
+  SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
+  PREVIEW_DOMAIN: ${{ github.ref_name == 'master' && 'https://msg-adamant-testnet.surge.sh' || 'https://dev-adamant-testnet.surge.sh' }}
+  CUSTOM_DOMAIN: ${{ github.ref_name == 'master' && 'http://msg-testnet.adamant.im' || 'http://dev-testnet.adamant.im' }}
+
+jobs:
+  build-and-deploy-to-surge:
+    name: Build and Deploy with Testnet ADM nodes to surge
+    runs-on: ubuntu-latest
+    environment: testnet
+    steps:
+      - name: Checkout repository 🛎️
+        uses: actions/checkout@v4
+
+      - name: Setup Node version 🍀
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies ⚙️
+        run: npm ci
+
+      - name: Build PWA 🛠️
+        run: |
+          npm run schema:generate
+          npm run build:testnet
+
+      - name: Archive artifacts 📁
+        uses: actions/upload-artifact@v4
+        with:
+          path: dist
+
+      - name: Deploy to surge 🚀
+        run: |
+          npm install --global surge
+          surge ./dist ${{ env.PREVIEW_DOMAIN }} --token ${{ secrets.SURGE_TOKEN }}
+          surge ./dist ${{ env.CUSTOM_DOMAIN }} --token ${{ secrets.SURGE_TOKEN }}

.sdkmanrc

@@ -0,0 +1,6 @@
+# Enable auto-env through the `sdkman_auto_env` config.
+# Add `<key>=<value>` pairs of SDKs to use below.
+#
+# @see https://sdkman.io/usage/#env-command
+
+java=21.0.7-jbr

README.md

@@ -2,8 +2,8 @@
 
 android {
   compileOptions {
-      sourceCompatibility JavaVersion.VERSION_17
-      targetCompatibility JavaVersion.VERSION_17
+      sourceCompatibility JavaVersion.VERSION_21
+      targetCompatibility JavaVersion.VERSION_21
   }
 }
 

adamant-wallets

@@ -8,7 +8,7 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode|navigation"
             android:name=".MainActivity"
             android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBarLaunch"
@@ -33,4 +33,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 </manifest>