Merge pull request #731 from Adamant-im/dev

Release v4.9.0

Author: bludnic

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @Adamant-im/pwa

.github/workflows/capacitor-android.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Build PWA
         run: |
           npm run schema:generate
-          npm run build
+          npm run android:prebuild
 
       - name: Extract Android signing key from ENV 🔑
         run: |

.gitignore

@@ -28,7 +28,8 @@ yarn-error.log*
 *.njsproj
 *.sln
 *.sw*
-
+# Android-builder out
+/dist-android
 # Electron-builder output
 /dist-electron
 # Electron app will be placed here after packaging

README.md

@@ -1,4 +1,4 @@
-[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/adamant-im/adamant-im/dev.yml)](https://github.com/Adamant-im/adamant-im/actions/workflows/dev.yml) [![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/Adamant-im/adamant-im?color=24bd13)](https://github.com/Adamant-im/adamant-im/graphs/commit-activity) [![GitHub release (with filter)](https://img.shields.io/github/v/release/adamant-im/adamant-im?color=24bd13)](https://github.com/Adamant-im/adamant-im/releases) [![Static Badge](https://img.shields.io/badge/Slack-brightgreen?logo=slack&logoColor=white&labelColor=fa8f02&color=grey&link=https%3A%2F%2Fjoin.slack.com%2Ft%2Fadamant-im%2Fshared_invite%2Fzt-3n32uqh3-TmTM4qPAKcp3PzrPMtKETQ)](https://join.slack.com/t/adamant-im/shared_invite/zt-3n32uqh3-TmTM4qPAKcp3PzrPMtKETQ) [![Static Badge](https://img.shields.io/badge/Twitter-brightgreen?logo=x&logoColor=white&labelColor=blue&color=grey&link=https%3A%2F%2Ftwitter.com%2Fadamant_im)](https://twitter.com/adamant_im)
+[![GitHub Workflow Status (with event)](https://img.shields.io/github/actions/workflow/status/adamant-im/adamant-im/preview.yml)](https://github.com/Adamant-im/adamant-im/actions/workflows/preview.yml) [![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/Adamant-im/adamant-im/dev?color=24bd13)](https://github.com/Adamant-im/adamant-im/graphs/commit-activity) [![GitHub release (with filter)](https://img.shields.io/github/v/release/adamant-im/adamant-im?color=24bd13)](https://github.com/Adamant-im/adamant-im/releases) [![Static Badge](https://img.shields.io/badge/Slack-brightgreen?logo=slack&logoColor=white&labelColor=fa8f02&color=grey&link=https%3A%2F%2Fjoin.slack.com%2Ft%2Fadamant-im%2Fshared_invite%2Fzt-3n32uqh3-TmTM4qPAKcp3PzrPMtKETQ)](https://join.slack.com/t/adamant-im/shared_invite/zt-3n32uqh3-TmTM4qPAKcp3PzrPMtKETQ) [![Static Badge](https://img.shields.io/badge/Twitter-brightgreen?logo=x&logoColor=white&labelColor=blue&color=grey&link=https%3A%2F%2Ftwitter.com%2Fadamant_im)](https://twitter.com/adamant_im)
 
 # ADAMANT Messenger Progressive Web Application (PWA)
 

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "im.adamant.adamantmessengerpwa"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 481
-        versionName "4.8.1"
+        versionCode 490
+        versionName "4.9.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

capacitor.config.ts

@@ -3,7 +3,7 @@ import { CapacitorConfig } from '@capacitor/cli'
 const config: CapacitorConfig = {
   appId: 'im.adamant.adamantmessengerpwa',
   appName: 'ADAMANT Messenger',
-  webDir: 'dist',
+  webDir: 'dist-android',
   server: {
     androidScheme: 'https'
   },

electron-vite.config.ts

@@ -2,6 +2,7 @@ import { mergeConfig } from 'vite'
 import { defineConfig } from 'vitest/config'
 import electron from 'vite-plugin-electron'
 import viteBaseConfig from './vite-base.config'
+import { excludeScreenshotsPlugin } from './vite-config/plugins/excludeScreenshotsPlugin'
 
 export default mergeConfig(
   viteBaseConfig,
@@ -12,7 +13,8 @@ export default mergeConfig(
     plugins: [
       electron({
         entry: 'src/electron/main.js'
-      })
+      }),
+      excludeScreenshotsPlugin()
     ]
   })
 )

jsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "paths": {
+      "@/*": ["./src/*"]
+    }
+  }
+}