Merge pull request #639 from Adamant-im/dev

Release v4.7.0

.github/workflows/capacitor-android.yml

@@ -0,0 +1,73 @@
+name: Capacitor [Android]
+
+on:
+  push:
+    branches:
+      - master
+      - dev
+
+env:
+  GH_TOKEN: ${{ secrets.github_token }}
+  ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+  ANDROID_KEYSTORE_PATH: './app.keystore' # relative to `./android` dir
+  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:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository 🛎️
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - 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
+
+      - name: Extract Android signing key from ENV 🔑
+        run: |
+          echo "$ANDROID_KEYSTORE_BASE64" > android/keystore.base64
+          base64 -d android/keystore.base64 > android/app.keystore
+          rm android/keystore.base64
+
+      - name: Build and Sign Android App 🛠️
+        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
+
+      - name: Save artifacts 💾
+        uses: actions/upload-artifact@v4
+        with:
+          name: android-release-app
+          path: |
+            android/app/build/outputs/bundle/release/*
+
+      - name: Clean Keystore file 🧹
+        run: |
+          rm android/app.keystore

.github/workflows/electron-linux.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout repository 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node version 🍀
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install dependencies ⚙️
         run: npm ci
@@ -31,7 +31,7 @@ jobs:
           npm run electron:build
 
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: electron-release-app
           path: |

.github/workflows/electron-mac.yml

@@ -21,12 +21,12 @@ jobs:
 
     steps:
       - name: Checkout repository 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node version 🍀
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install dependencies ⚙️
         run: npm ci
@@ -37,7 +37,7 @@ jobs:
           npm run electron:build
 
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: electron-release-app
           path: |

.github/workflows/electron-windows.yml

@@ -15,12 +15,12 @@ jobs:
 
     steps:
       - name: Checkout repository 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node version 🍀
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install dependencies ⚙️
         run: npm ci
@@ -31,7 +31,7 @@ jobs:
           npm run electron:build
 
       - name: Save artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: electron-release-app
           path: |

.github/workflows/preview.yml

@@ -21,12 +21,12 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository 🛎️
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node version 🍀
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install dependencies ⚙️
         run: npm ci
@@ -37,7 +37,7 @@ jobs:
           npm run build
 
       - name: Archive artifacts 📁
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: dist
 

.gitignore

@@ -41,6 +41,10 @@ yarn-error.log*
 # Vercel
 .vercel
 
+# Capacitor
+capacitor.env
+capacitor/app.keystore
+
 # adamant-schema
 src/lib/schema/*
 !src/lib/schema/schema.json

README.md

@@ -88,6 +88,27 @@ APPLE_NOTARIZE=true npm run electron:build
 npm run electron:serve
 ```
 
+### Opening the Android project in Android Studio
+
+```shell
+$ npm run android:open
+```
+
+### Running Android app
+
+```shell
+$ npm run android:run
+```
+
+> Note: You must have an Android emulator or a connected device to run the app.
+
+### Build and sign Android app
+
+```shell
+$ cp capacitor.env.example capacitor.env # replace ENV values before build
+$ npm run android:build
+```
+
 [Download pre-build apps](https://adamant.im/#adm-apps) for macOS, Windows and Linux.
 
 #### Note for Windows users

android/.gitignore

@@ -0,0 +1,101 @@
+# Using Android gitignore template: https://github.com/github/gitignore/blob/HEAD/Android.gitignore
+
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+# Android Profiling
+*.hprof
+
+# Cordova plugins for Capacitor
+capacitor-cordova-android-plugins
+
+# Copied web assets
+app/src/main/assets/public
+
+# Generated Config files
+app/src/main/assets/capacitor.config.json
+app/src/main/assets/capacitor.plugins.json
+app/src/main/res/xml/config.xml

android/app/.gitignore

@@ -0,0 +1,2 @@
+/build/*
+!/build/.npmkeep

android/app/build.gradle

@@ -0,0 +1,54 @@
+apply plugin: 'com.android.application'
+
+android {
+    namespace "im.adamant.adamantmessengerpwa"
+    compileSdk rootProject.ext.compileSdkVersion
+    defaultConfig {
+        applicationId "im.adamant.adamantmessengerpwa"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode 470
+        versionName "4.7.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        aaptOptions {
+             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
+             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
+            ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
+        }
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+repositories {
+    flatDir{
+        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
+    implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
+    implementation project(':capacitor-android')
+    testImplementation "junit:junit:$junitVersion"
+    androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
+    implementation project(':capacitor-cordova-android-plugins')
+}
+
+apply from: 'capacitor.build.gradle'
+
+try {
+    def servicesJSON = file('google-services.json')
+    if (servicesJSON.text) {
+        apply plugin: 'com.google.gms.google-services'
+    }
+} catch(Exception e) {
+    logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
+}

android/app/capacitor.build.gradle

@@ -0,0 +1,19 @@
+// DO NOT EDIT THIS FILE! IT IS GENERATED EACH TIME "capacitor update" IS RUN
+
+android {
+  compileOptions {
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
+  }
+}
+
+apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
+dependencies {
+
+
+}
+
+
+if (hasProperty('postBuildExtras')) {
+  postBuildExtras()
+}