✨ Start building with Gradle instead of capacitor

.github/workflows/android.yaml

@@ -0,0 +1,48 @@
+name: Android CI
+
+on:
+  push:
+    branches: main
+
+jobs:
+  build_android:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # Java
+      - uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: temurin
+          cache: gradle
+
+      # Node
+      - uses: pnpm/action-setup@v2
+        with:
+          version: latest
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: pnpm
+      - run: pnpm install --frozen-lockfile
+
+      # Secrets
+      - run: |
+          echo 'keyAlias=${{ secrets.KEY_ALIAS }}' >> android/key.properties
+          echo 'keyPassword=${{ secrets.KEY_PASSWORD }}' >> android/key.properties
+          echo 'storePassword=${{ secrets.STORE_PASSWORD }}' >> android/key.properties
+          echo 'storeFile=${{ secrets.STORE_FILE }}' >> android/key.properties
+          echo '${{ secrets.KEY_STORE }}' | base64 --decode > android/app/${{ secrets.STORE_FILE }}
+
+      # Android SDK
+      - run: yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "build-tools;33.0.2" "platforms;android-33"
+
+      # Build
+      - run: pnpm run build:apk
+      - uses: actions/upload-artifact@v3
+        with:
+          name: app-release
+          path: android/app/build/outputs/apk/release/app-release.apk
+          if-no-files-found: error

.github/workflows/github-pages.yaml

@@ -2,10 +2,10 @@ name: GitHub Pages
 
 on:
   push:
-    branches: ['main']
+    branches: main
 
 jobs:
-  build:
+  build_pages:
     runs-on: ubuntu-latest
 
     steps:
@@ -23,8 +23,8 @@ jobs:
         with:
           path: build
 
-  deploy:
-    needs: build
+  deploy_pages:
+    needs: build_pages
 
     permissions:
       pages: write

.github/workflows/node.js.yaml

@@ -2,9 +2,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: ['main']
+    branches: main
   pull_request:
-    branches: ['main']
+    branches: main
 
 jobs:
   test:

README.md

@@ -12,12 +12,46 @@ There is an alpha build at <https://natoboram.github.io/Leanish>.
 
 ## Build from source
 
+### Web
+
 ```sh
 git clone https://github.com/NatoBoram/Leanish.git
 cd Leanish
-pnpm i
-BUILD_ADAPTER=node pnpm build
+pnpm install
+BUILD_ADAPTER=node pnpm run build
 node ./build/index.js
 ```
 
 This gives you access to a local server at <http://localhost:3000> that you can even access from your mobile device.
+
+### Android
+
+You need a signing key to make a release build. You can generate it with `keytool`:
+
+```sh
+keytool -alias key -genkey -keyalg RSA -keysize 7680 -keystore keystore.pkcs12 -v -validity 36525
+```
+
+Move the keystore somewhere safe and create a file `android/key.properties` with the following content:
+
+```properties
+keyAlias=key
+keyPassword=
+storeFile=keystore.pkcs12
+storePassword=
+```
+
+Don't forget to put the full path and actual passwords in the file. You can find more information about signing keys in <https://docs.flutter.dev/deployment/android#signing-the-app>.
+
+To make a release build:
+
+```sh
+yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --install "build-tools;33.0.2" "platforms;android-33"
+git clone https://github.com/NatoBoram/Leanish.git
+cd Leanish
+pnpm install
+pnpm run build:apk
+pnpm run install:apk
+```
+
+This will create a release build at `android/app/build/outputs/apk/release/app-release.apk` and install it on your phone.

android/.gitignore

@@ -25,6 +25,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+key.properties
 
 # Proguard folder generated by Eclipse
 proguard/

android/app/build.gradle

@@ -1,54 +1,71 @@
 apply plugin: 'com.android.application'
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+	keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
-    namespace "com.natoboram.leanish"
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    defaultConfig {
-        applicationId "com.natoboram.leanish"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.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'
-        }
-    }
+	namespace "com.natoboram.leanish"
+	compileSdkVersion rootProject.ext.compileSdkVersion
+	defaultConfig {
+		applicationId "com.natoboram.leanish"
+		minSdkVersion rootProject.ext.minSdkVersion
+		targetSdkVersion rootProject.ext.targetSdkVersion
+		versionCode rootProject.ext.versionCode
+		versionName rootProject.ext.versionName
+		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:!*~'
+		}
+	}
+	signingConfigs {
+		release {
+			keyAlias keystoreProperties['keyAlias']
+			keyPassword keystoreProperties['keyPassword']
+			storeFile file(keystoreProperties['storeFile'])
+			storePassword keystoreProperties['storePassword']
+		}
+	}
+	buildTypes {
+		release {
+			signingConfig signingConfigs.release
+
+			minifyEnabled false
+
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+		}
+	}
 }
 
 repositories {
-    flatDir{
-        dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
-    }
+	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')
+	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")
+	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/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

@@ -1,10 +1,12 @@
 package com.getcapacitor.myapp;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import android.content.Context;
+
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -16,11 +18,11 @@
 @RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
 
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+	@Test
+	public void useAppContext() throws Exception {
+		// Context of the app under test.
+		Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
-        assertEquals("com.getcapacitor.app", appContext.getPackageName());
-    }
+		assertEquals("com.getcapacitor.app", appContext.getPackageName());
+	}
 }

android/app/src/main/AndroidManifest.xml

@@ -9,12 +9,12 @@
 		android:theme="@style/AppTheme"
 	>
 		<activity
-			android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
 			android:name=".MainActivity"
+			android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+			android:exported="true"
 			android:label="@string/title_activity_main"
-			android:theme="@style/AppTheme.NoActionBarLaunch"
 			android:launchMode="singleTask"
-			android:exported="true"
+			android:theme="@style/AppTheme.NoActionBarLaunch"
 		>
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />

android/app/src/main/java/com/natoboram/leanish/MainActivity.java

@@ -2,4 +2,5 @@
 
 import com.getcapacitor.BridgeActivity;
 
-public class MainActivity extends BridgeActivity {}
+public class MainActivity extends BridgeActivity {
+}

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -3,14 +3,14 @@
 	xmlns:aapt="http://schemas.android.com/aapt"
 	android:width="108dp"
 	android:height="108dp"
-	android:viewportHeight="108"
 	android:viewportWidth="108"
+	android:viewportHeight="108"
 >
 	<path
 		android:fillType="evenOdd"
 		android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-		android:strokeColor="#00000000"
 		android:strokeWidth="1"
+		android:strokeColor="#00000000"
 	>
 		<aapt:attr name="android:fillColor">
 			<gradient
@@ -29,7 +29,7 @@
 		android:fillColor="#FFFFFF"
 		android:fillType="nonZero"
 		android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-		android:strokeColor="#00000000"
 		android:strokeWidth="1"
+		android:strokeColor="#00000000"
 	/>
 </vector>