chore: meege upstream branch

.github/workflows/ci_master.yml

@@ -48,6 +48,46 @@ jobs:
           files: |
             android_app/app/build/outputs/apk/debug/openScale-debug.apk
 
+  # Publish the "Supported scales in openScale" wiki page, generated from the handler registry by
+  # ScaleCatalogTest. The page is a build artifact: hand edits in the wiki are overwritten, while
+  # the remarks column and the photo gallery are edited in
+  # android_app/app/src/test/resources/scale_catalog_{remarks.txt,gallery.md}.
+  publish-scale-catalog:
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "21"
+      - name: Checkout wiki
+        run: git clone "https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.wiki.git" wiki
+      - name: Generate the supported scales page
+        working-directory: android_app
+        env:
+          SCALE_CATALOG_OUT: ${{ github.workspace }}/wiki/Supported-scales-in-openScale.md
+        run: |
+          ./gradlew testDebugUnitTest --tests '*ScaleCatalogTest'
+          # A skipped (up-to-date) test task would leave the page untouched and the job green.
+          test -s "$SCALE_CATALOG_OUT"
+      - name: Push the page if it changed
+        working-directory: wiki
+        run: |
+          if [ -z "$(git status --porcelain)" ]; then
+            echo "Wiki already up to date."
+            exit 0
+          fi
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git add Supported-scales-in-openScale.md
+          git commit -m "Update supported scales from the handler registry (${GITHUB_SHA::7})"
+          git push
+
   # Keep the `weblate` branch (Weblate's push target) in sync with master so
   # Weblate's rebased translation pushes stay fast-forward and don't fail.
   sync-weblate:

README.md

@@ -30,7 +30,7 @@ Monitor and track your weight, BMI, body fat, body water, muscle and other body
 openScale has built-in support for a number of Bluetooth (BLE or "smart") scales from  many manufacturers, e.g. Beurer, Sanitas, Yunmai, Xiaomi, etc. (see model list below). Together with our users we constantly improve and extend the set of supported scales and in many cases pick up where the original app falls short.
 
 - Custom made Bluetooth scale
-- Beurer BF105, BF500, BF600, BF700, BF710, BF720, BF800, BF850 and BF950
+- Beurer BF105, BF500, BF600, BF700, BF710, BF720, BF800, BF850, BF950 and BF1000
 - Digoo DG-S038H
 - Excelvan CF369BLE
 - Exingtech Y1
@@ -42,7 +42,7 @@ openScale has built-in support for a number of Bluetooth (BLE or "smart") scales
 - Silvercrest SBF75, SBF77
 - Vigorun
 - Xiaomi Mi scale v1 and v2
-- Yunmai Mini and SE
+- Yunmai Mini, SE and X
 - iHealth HS3
 - Easy Home 64050
 - and many more

android_app/app/build.gradle.kts

@@ -29,8 +29,8 @@ android {
         applicationId = "com.health.openscale"
         minSdk = 31
         targetSdk = 37
-        versionCode = 75
-        versionName = "3.1.1"
+        versionCode = 76
+        versionName = "3.1.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders["appName"] = "openScale"
@@ -148,6 +148,10 @@ android {
         // JVM unit tests touch android.util.Log (via LogManager); return defaults
         // instead of throwing "not mocked" so pure-logic tests can run on the JVM.
         unitTests.isReturnDefaultValues = true
+        // Hand the merged resource table to Robolectric, so code that resolves a string
+        // resource (e.g. the display name of a scale-contributed measurement type) can be
+        // tested against the real string instead of a stub.
+        unitTests.isIncludeAndroidResources = true
     }
 }