Configure Eclipse WTP XML formatter for Android Studio-like output

.github/workflows/check-format.yml

@@ -0,0 +1,35 @@
+name: Check Java formatting
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+jobs:
+  spotless:
+    name: Check Java formatting (Spotless)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+      - uses: actions/setup-java@v5
+        with:
+          java-version: 17
+          distribution: temurin
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Validate Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v4
+      - name: Check formatting
+        run: ./gradlew spotlessCheck

CONTRIBUTING.md

@@ -100,6 +100,12 @@ Try to not follow these patterns and keep things really on point and simple.
 If this gets in conflict with embracing existing style, however,
 consistency with existing code is more important.
 
+**Code formatting:** The project uses [google-java-format](https://github.com/google/google-java-format)
+(Google style, 2-space indent — matches Android Studio's default formatter) for Java files and
+Eclipse WTP for XML files, both enforced via the [Spotless](https://github.com/diffplug/spotless) Gradle plugin.
+Auto-format all files by running `scripts/format.sh` or `./gradlew spotlessApply` before opening a PR.
+CI will fail if files are not formatted correctly — make sure to run the formatter before pushing.
+
 The "Delta Chat Core" is a high-level interface to what the UI actually needs,
 data should be served in a form that the UI do not need much additional work.
 If this is not the case, consider a feature proposal to "Delta Chat Core".

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.application' version '8.11.1'
     id 'com.google.gms.google-services' version '4.4.1'
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 repositories {
@@ -202,6 +203,22 @@ android {
 
 }
 
+spotless {
+    java {
+        target 'src/**/*.java'
+        googleJavaFormat('1.19.2')  // Google style = 2-space indent, matches Android Studio default
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+    format 'xml', {
+        target 'src/**/*.xml'
+        eclipseWtp('xml').configFile('spotless/eclipse-wtp-xml.prefs')
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}
+
 final def  markwon_version =  '4.6.2'
 
 dependencies {

gradle.properties

@@ -2,4 +2,11 @@ android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
 android.nonTransitiveRClass=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4608m
+# The --add-exports flags below are required by google-java-format (via Spotless) on Java 17+
+# to access internal compiler APIs for formatting. See https://github.com/diffplug/spotless/issues/834
+org.gradle.jvmargs=-Xmx4608m \
+  --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

scripts/format.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+./gradlew spotlessApply

settings.gradle

@@ -1,5 +1,6 @@
 pluginManagement {
     repositories {
+        gradlePluginPortal()
         google()
         mavenCentral()
     }

spotless/eclipse-wtp-xml.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+lineWidth=160
+splitMultiAttrs=true
+indentMultipleAttributes=true
+indentationChar=space
+indentationSize=4

src/debug/res/drawable/ic_launcher_foreground.xml

@@ -1,17 +1,19 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="228"
     android:viewportHeight="280">
-  <group android:scaleX="0.35014287"
-      android:scaleY="0.43"
-      android:translateX="74.08372"
-      android:translateY="79.8">
-    <path
-        android:pathData="m10.03,234.14c0.3,-0.01 0.6,-0.02 0.9,-0.04 -0.07,-0.49 -0.14,-0.97 -0.2,-1.46 -0.15,-1.34 -0.26,-2.69 -0.25,-4.04 -0.02,-0.86 -0.05,-1.71 -0.07,-2.57 -0.09,-0.06 -0.18,-0.13 -0.27,-0.19 -0.02,-0.02 -0.04,-0.03 -0.07,-0.05zM44.87,232.95c11.71,-8.35 26.86,-14.79 46.21,-15.9 0,0 39.93,-0.27 47.91,-3.53 7.98,-3.26 68.68,-14.69 82.94,-98.43 14.26,-83.74 -1.06,-115.09 -1.06,-115.09 0,0 -21.14,55.68 -81.02,59.81 0,0 -14.5,1.03 -38.82,1.42 -24.32,0.39 -75.77,20.65 -90.55,85.62l-0.22,43.44c2.5,4.22 5.49,8.12 8.91,11.66 3.99,4.11 8.11,8.12 12.79,11.45 2.26,1.65 4.65,3.2 6.51,5.33 1.94,2.34 3.33,5 4.2,7.93 0.71,2.1 1.45,4.2 2.2,6.28z"
-        android:fillColor="@color/ic_launcher_background"/>
-    <path
-        android:pathData="m217.97,45.86c-0.3,0.01 -0.6,0.02 -0.9,0.04 0.07,0.49 0.14,0.97 0.2,1.46 0.15,1.34 0.26,2.69 0.25,4.04 0.02,0.86 0.05,1.71 0.07,2.57 0.09,0.06 0.18,0.13 0.27,0.19 0.02,0.02 0.04,0.03 0.07,0.05zM183.13,47.05c-11.71,8.35 -26.86,14.79 -46.21,15.9 0,0 -39.93,0.27 -47.91,3.53 -7.98,3.26 -68.68,14.69 -82.94,98.43 -14.26,83.74 1.06,115.09 1.06,115.09 0,0 21.14,-55.68 81.02,-59.81 0,0 14.5,-1.03 38.82,-1.42 24.32,-0.39 75.77,-20.65 90.55,-85.62l0.22,-43.44c-2.5,-4.22 -5.49,-8.12 -8.91,-11.66 -3.99,-4.11 -8.11,-8.12 -12.79,-11.45 -2.26,-1.65 -4.65,-3.2 -6.51,-5.33 -1.94,-2.34 -3.33,-5 -4.2,-7.93 -0.71,-2.1 -1.45,-4.2 -2.2,-6.28z"
-        android:fillColor="@color/ic_launcher_background"/>
-  </group>
+    <group
+        android:scaleX="0.35014287"
+        android:scaleY="0.43"
+        android:translateX="74.08372"
+        android:translateY="79.8">
+        <path
+            android:pathData="m10.03,234.14c0.3,-0.01 0.6,-0.02 0.9,-0.04 -0.07,-0.49 -0.14,-0.97 -0.2,-1.46 -0.15,-1.34 -0.26,-2.69 -0.25,-4.04 -0.02,-0.86 -0.05,-1.71 -0.07,-2.57 -0.09,-0.06 -0.18,-0.13 -0.27,-0.19 -0.02,-0.02 -0.04,-0.03 -0.07,-0.05zM44.87,232.95c11.71,-8.35 26.86,-14.79 46.21,-15.9 0,0 39.93,-0.27 47.91,-3.53 7.98,-3.26 68.68,-14.69 82.94,-98.43 14.26,-83.74 -1.06,-115.09 -1.06,-115.09 0,0 -21.14,55.68 -81.02,59.81 0,0 -14.5,1.03 -38.82,1.42 -24.32,0.39 -75.77,20.65 -90.55,85.62l-0.22,43.44c2.5,4.22 5.49,8.12 8.91,11.66 3.99,4.11 8.11,8.12 12.79,11.45 2.26,1.65 4.65,3.2 6.51,5.33 1.94,2.34 3.33,5 4.2,7.93 0.71,2.1 1.45,4.2 2.2,6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+        <path
+            android:pathData="m217.97,45.86c-0.3,0.01 -0.6,0.02 -0.9,0.04 0.07,0.49 0.14,0.97 0.2,1.46 0.15,1.34 0.26,2.69 0.25,4.04 0.02,0.86 0.05,1.71 0.07,2.57 0.09,0.06 0.18,0.13 0.27,0.19 0.02,0.02 0.04,0.03 0.07,0.05zM183.13,47.05c-11.71,8.35 -26.86,14.79 -46.21,15.9 0,0 -39.93,0.27 -47.91,3.53 -7.98,3.26 -68.68,14.69 -82.94,98.43 -14.26,83.74 1.06,115.09 1.06,115.09 0,0 21.14,-55.68 81.02,-59.81 0,0 14.5,-1.03 38.82,-1.42 24.32,-0.39 75.77,-20.65 90.55,-85.62l0.22,-43.44c-2.5,-4.22 -5.49,-8.12 -8.91,-11.66 -3.99,-4.11 -8.11,-8.12 -12.79,-11.45 -2.26,-1.65 -4.65,-3.2 -6.51,-5.33 -1.94,-2.34 -3.33,-5 -4.2,-7.93 -0.71,-2.1 -1.45,-4.2 -2.2,-6.28z"
+            android:fillColor="@color/ic_launcher_background" />
+    </group>
 </vector>

src/debug/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@color/white" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>

src/foss/AndroidManifest.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
-  <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="specialUse"
-        android:enabled="true" />
-  </application>
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="specialUse"
+            android:enabled="true" />
+    </application>
 
 </manifest>

src/gplay/AndroidManifest.xml

@@ -1,34 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
-  <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging"/>
+    <!-- force compiling emojipicker on sdk<21 and firebase on sdk<19; runtime checks are required then -->
+    <uses-sdk tools:overrideLibrary="androidx.emoji2.emojipicker, com.google.firebase.messaging, com.google.android.gms.cloudmessaging" />
 
-  <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
-  <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
-  <meta-data android:name="firebase_messaging_auto_init_enabled" android:value="false" />
+    <meta-data
+        android:name="firebase_analytics_collection_deactivated"
+        android:value="true" />
+    <meta-data
+        android:name="google_analytics_adid_collection_enabled"
+        android:value="false" />
+    <meta-data
+        android:name="firebase_messaging_auto_init_enabled"
+        android:value="false" />
 
-  <application>
-    <service
-        android:name=".connect.KeepAliveService"
-        android:foregroundServiceType="dataSync"
-        android:enabled="true" />
+    <application>
+        <service
+            android:name=".connect.KeepAliveService"
+            android:foregroundServiceType="dataSync"
+            android:enabled="true" />
 
-    <service
-        android:name=".notifications.FcmReceiveService"
-        android:foregroundServiceType="dataSync"
-        android:exported="true">
-      <intent-filter>
-        <action android:name="com.google.firebase.MESSAGING_EVENT" />
-      </intent-filter>
-    </service>
+        <service
+            android:name=".notifications.FcmReceiveService"
+            android:foregroundServiceType="dataSync"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
 
-    <provider
-        android:name="com.google.firebase.provider.FirebaseInitProvider"
-        android:authorities="${applicationId}.firebaseinitprovider"
-        tools:node="remove">
-    </provider>
-  </application>
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="${applicationId}.firebaseinitprovider"
+            tools:node="remove">
+        </provider>
+    </application>
 
 </manifest>