Update fastlane to 2.208

.github/FUNDING.yml

@@ -1,4 +1,5 @@
 # These are supported funding model platforms
-
+github:
+  - d4rken
 custom:
   - "https://www.buymeacoffee.com/tydarken"

.github/workflows/release-tag.yml

@@ -68,7 +68,7 @@ jobs:
           tag_name: ${{ steps.tagger.outputs.tag }}
           name: ${{ steps.tagger.outputs.tag }}
           generate_release_notes: true
-          files: app/build/outputs/apk/beta/*.apk
+          files: app/build/outputs/apk/foss/beta/*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -80,7 +80,7 @@ jobs:
           tag_name: ${{ steps.tagger.outputs.tag }}
           name: ${{ steps.tagger.outputs.tag }}
           generate_release_notes: true
-          files: app/build/outputs/apk/release/*.apk
+          files: app/build/outputs/apk/foss/release/*.apk
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

Gemfile.lock

@@ -8,20 +8,20 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.554.0)
+    aws-partitions (1.610.0)
-    aws-sdk-core (3.126.0)
+    aws-sdk-core (3.131.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
+      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.54.0)
+    aws-sdk-kms (1.58.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.112.0)
+    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.126.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -36,8 +36,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.2.3)
-    excon (0.91.0)
+    excon (0.92.4)
-    faraday (1.9.3)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -56,8 +56,8 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.3)
+    faraday-multipart (1.0.4)
-      multipart-post (>= 1.2, < 3)
+      multipart-post (~> 2)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.204.3)
+    fastlane (2.208.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -106,9 +106,9 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.16.0)
+    google-apis-androidpublisher_v3 (0.25.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.7, < 2.a)
-    google-apis-core (0.4.2)
+    google-apis-core (0.7.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -117,19 +117,19 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.10.0)
+    google-apis-iamcredentials_v1 (0.13.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.7, < 2.a)
-    google-apis-playcustomapp_v1 (0.7.0)
+    google-apis-playcustomapp_v1 (0.10.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.7, < 2.a)
-    google-apis-storage_v1 (0.11.0)
+    google-apis-storage_v1 (0.18.0)
-      google-apis-core (>= 0.4, < 2.a)
+      google-apis-core (>= 0.7, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
+    google-cloud-env (1.6.0)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.3, < 3.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.1)
+    google-cloud-storage (1.37.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -137,20 +137,20 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.1.0)
+    googleauth (1.2.0)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.4)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.5.0)
+    jmespath (1.6.1)
-    json (2.6.1)
+    json (2.6.2)
-    jwt (2.3.0)
+    jwt (2.4.1)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
@@ -161,9 +161,9 @@ GEM
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.6)
+    public_suffix (4.0.7)
     rake (13.0.6)
-    representable (3.1.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
@@ -173,9 +173,9 @@ GEM
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
     security (0.1.3)
-    signet (0.16.0)
+    signet (0.17.0)
       addressable (~> 2.8)
-      faraday (>= 0.17.3, < 2.0)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simctl (1.6.8)
@@ -192,11 +192,11 @@ GEM
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.8)
+    unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     webrick (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.21.0)
+    xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)

README.md

@@ -2,7 +2,7 @@
 
 # Companion App for AirPods (CAPod)
 [![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/d4rken-org/capod?include_prereleases)](https://github.com/d4rken-org/capod/releases/latest)
-[![Code tests & eval](https://github.com/d4rken/capod/actions/workflows/code-checks.yml/badge.svg)](https://github.com/d4rken/capod/actions/workflows/code-checks.yml)
+[![Code tests & eval](https://github.com/d4rken-org/capod/actions/workflows/code-checks.yml/badge.svg)](https://github.com/d4rken/capod/actions/workflows/code-checks.yml)
 [![Crowdin](https://badges.crowdin.net/capod/localized.svg)](https://crowdin.com/project/capod)
 [![Github All Releases](https://img.shields.io/github/downloads/d4rken-org/capod/total.svg)](https://github.com/d4rken-org/capod/releases/latest)
 
@@ -40,13 +40,13 @@ Currently supported models:
 ## Support the project
 
 * Buy the CAPod Pro In-App purchase on [Google Play](https://play.google.com/store/apps/details?id=eu.darken.capod)
+* [Sponsor development](https://github.com/sponsors/d4rken) on GitHub
 * Help translate CAPod [on Crowdin](https://crowdin.com/project/capod)
 
 ## Get help
 
 * [Github Issues](https://github.com/d4rken-org/capod/issues)
 * [Discord](https://discord.gg/vHubYPp)
-* [Email](mailto:support@darken.eu)
 
 ## Screenshots
 

app/src/foss/java/eu/darken/capod/common/upgrade/core/UpgradeControlFoss.kt

@@ -40,7 +40,7 @@ class UpgradeControlFoss @Inject constructor(
                     upgradedAt = Instant.now(),
                     reason = FossUpgrade.Reason.DONATED
                 )
-                webpageTool.open("https://github.com/d4rken-org/capod")
+                webpageTool.open("https://github.com/d4rken-org/capod#support-the-project")
                 Toast.makeText(activity, R.string.general_thank_you_label, Toast.LENGTH_SHORT).show()
             }
             setNegativeButton(R.string.foss_upgrade_alreadydonated_label) { _, _ ->

app/src/foss/res/values-de/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="foss_upgrade_donate_label">Spenden</string>
     <string name="foss_upgrade_alreadydonated_label">Ich habe schon gespendet</string>
-    <string name="foss_upgrade_no_money_label">Ich gebe mein ganzes Geld für AirPods aus</string>
+    <string name="foss_upgrade_no_money_label" comment="Can't be too long otherwise the dialog ellipsizes it. foss_upgrade_no_money_label" maxLength="35">Hab alles für AirPods ausgegeben</string>
 </resources>

app/src/foss/res/values-vi/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="foss_upgrade_donate_label">Quyên tặng</string>
     <string name="foss_upgrade_alreadydonated_label">Tôi đã quyên góp</string>
-    <string name="foss_upgrade_no_money_label">Tôi tiêu hết tiền cho AirPods</string>
+    <string name="foss_upgrade_no_money_label" comment="Can't be too long otherwise the dialog ellipsizes it. foss_upgrade_no_money_label" maxLength="35">Tôi tiêu hết tiền cho AirPods</string>
 </resources>

app/src/main/res/values-de/strings.xml

@@ -11,7 +11,7 @@
     <string name="general_thank_you_label">Danke</string>
     <string name="general_value_not_available_label">k.A.</string>
     <string name="general_grant_permission_action">Berechtigung erteilen</string>
-    <string name="general_upgrade_action">Aktualisierung</string>
+    <string name="general_upgrade_action">Upgrade</string>
     <string name="general_check_action">Überprüfen</string>
     <string name="general_close_action">Schließen</string>
     <string name="debug_debuglog_size_label">Größe</string>
@@ -115,7 +115,7 @@
     <string name="settings_reaction_autoconnect_whenseen_label">Wenn gesehen</string>
     <string name="settings_reaction_autoconnect_caseopen_label">Fall ist offen</string>
     <string name="settings_reaction_autoconnect_inear_label">Im Ohr</string>
-    <string name="upgrade_capod_label">Aktualisieren Sie CAPod</string>
+    <string name="upgrade_capod_label">Verbesser CAPod</string>
     <string name="upgrade_capod_description">Erhalten Sie zusätzliche Funktionen und unterstützen Sie den Entwickler.</string>
     <string name="settings_popup_caseopen_label">Popup zeigen</string>
     <string name="settings_popup_caseopen_description">Ein Popup anzeigen, wenn das Gerätegehäuse geöffnet wird (experimentell).</string>

app/src/main/res/values-in/strings.xml

@@ -135,13 +135,5 @@
     <string name="settings_compatibility_mode_label">Mode kompatibilitas</string>
     <string name="settings_compatibility_mode_description">Nonaktifkan pengoptimalan untuk meningkatkan kompatibilitas. Coba ini jika anda tidak melihat data apa pun.</string>
     <string name="translators_thanks_title">Penerjemah</string>
-    <string name="translators_thanks_description" comment="translators_thanks_description&#10;&#10;You can voluntarily add your name here to have it displayed in the app. It will be shown in the Settings&gt;Acknowledgements&gt;Thank you section.&#10;&#10;Separate names by semicolons and an optional email may be included in brackets, example:&#10;&#10;darken(darken@darken.eu);John Doe(john@example.com)&#10;&#10;&quot;darken&quot; is just a placeholder and does not have to be kept if/when you add yours.&#10;&#10;Be nice to each other!">nama anda dapat ditambahkan sebagai relawan di sini dan ditampilkan di aplikasi. Itu akan ditampilkan pada bagian Pengaturan>Penghargaan>Terima kasih
+    <string name="translators_thanks_description" comment="translators_thanks_description&#10;&#10;You can voluntarily add your name here to have it displayed in the app. It will be shown in the Settings&gt;Acknowledgements&gt;Thank you section.&#10;&#10;Separate names by semicolons and an optional email may be included in brackets, example:&#10;&#10;darken(darken@darken.eu);John Doe(john@example.com)&#10;&#10;&quot;darken&quot; is just a placeholder and does not have to be kept if/when you add yours.&#10;&#10;Be nice to each other!">darken</string>
-
-Pisahkan nama dengan titik koma dan email opsional dapat dimasukkan dalam tanda kurung, contoh:
-
-𝓼𝓾𝓵𝓽𝓪𝓷 𝓱𝓪𝓶𝓴𝓪(sultanhamka@gmail.com); John Doe(john@example.com)
-
-\"𝓼𝓾𝓵𝓽𝓪𝓷 𝓱𝓪𝓶𝓴𝓪\" hanyalah pengganti dan tidak harus disimpan jika/ketika anda menambahkan milik anda.
-
-Bersikap baik satu sama lain!</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -95,6 +95,7 @@
     <string name="last_seen_x">Востаннє був: %s</string>
     <string name="first_seen_x">Уперше був: %s</string>
     <string name="permission_required_title">Необхідні наступні дозволи:</string>
+    <string name="settings_compatibility_mode_label">Режим сумісності</string>
     <string name="translators_thanks_title">Перекладачі</string>
     <string name="translators_thanks_description" comment="translators_thanks_description&#10;&#10;You can voluntarily add your name here to have it displayed in the app. It will be shown in the Settings&gt;Acknowledgements&gt;Thank you section.&#10;&#10;Separate names by semicolons and an optional email may be included in brackets, example:&#10;&#10;darken(darken@darken.eu);John Doe(john@example.com)&#10;&#10;&quot;darken&quot; is just a placeholder and does not have to be kept if/when you add yours.&#10;&#10;Be nice to each other!">Ievgen Gil</string>
 </resources>

app/src/main/res/values-vi/strings.xml

@@ -21,8 +21,8 @@
     <string name="debug_debuglog_record_action">Ghi nhật ký gỡ lỗi</string>
     <string name="permission_bluetooth_connect_label">Kết nối Bluetooth</string>
     <string name="permission_bluetooth_connect_description">Ứng dụng này yêu cầu quyền \"Kết nối Bluetooth\" để tương tác với các thiết bị được ghép nối và bắt đầu kết nối.</string>
-    <string name="permission_bluetooth_scan_label">Quét Bluetooth</string>
+    <string name="permission_bluetooth_scan_label">Quét qua Bluetooth</string>
-    <string name="permission_bluetooth_scan_description">Quyền \"quét Bluetooth\" cho phép ứng dụng này khám phá và nhận dữ liệu Bluetooth từ các thiết bị lân cận, chẳng hạn như AirPods của bạn.</string>
+    <string name="permission_bluetooth_scan_description">Quyền \"quét qua Bluetooth\" cho phép ứng dụng này khám phá và nhận dữ liệu Bluetooth từ các thiết bị lân cận, chẳng hạn như AirPods của bạn.</string>
     <string name="permission_bluetooth_label">Bluetooth</string>
     <string name="permission_bluetooth_description">Ứng dụng này yêu cầu quyền \"Bluetooth\" để kết nối với các thiết bị Bluetooth được ghép nối.</string>
     <string name="permission_access_fine_location_label">Truy cập vị trí chính xác</string>

app/src/main/res/xml/preferences_support.xml

@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        android:icon="@drawable/ic_github_onsurface"
-        android:summary="@string/issue_tracker_description"
-        android:title="@string/issue_tracker_label">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/d4rken-org/capod/issues" />
-    </Preference>
     <Preference
         android:icon="@drawable/ic_discord_onsurface"
         android:summary="@string/discord_description"
@@ -18,6 +9,14 @@
             android:action="android.intent.action.VIEW"
             android:data="https://discord.gg/rrxxng35jq" />
     </Preference>
+    <Preference
+        android:icon="@drawable/ic_github_onsurface"
+        android:summary="@string/issue_tracker_description"
+        android:title="@string/issue_tracker_label">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:data="https://github.com/d4rken-org/capod/issues" />
+    </Preference>
     <Preference
         android:icon="@drawable/ic_email_onsurface"
         android:key="support.email.darken"

build.gradle

@@ -9,7 +9,7 @@ buildscript {
                     'major': 1,
                     'minor': 3,
                     'patch': 13,
-                    'build': 0,
+                    'build': 6,
             ],
     ]
 

fastlane/Appfile

@@ -1,2 +0,0 @@
-json_key_file "~/.appconfig/eu.darken.capod/gplay-capod-ci_api.json"
-package_name "eu.darken.capod"

fastlane/Fastfile

@@ -11,7 +11,7 @@
 
 # This is the minimum version number required.
 # Update this, if you use features of a newer version
-fastlane_version "2.175.0"
+fastlane_version "2.208.0"
 
 default_platform :android
 
@@ -21,11 +21,14 @@ platform :android do
   end
 
   lane :beta do
-    gradle(task: 'clean assembleGplayBeta')
+    gradle(task: 'clean bundleGplayBeta')
     sh "bash ./remove_unsupported_languages.sh"
   	supply(
         track: 'beta',
+        package_name: 'eu.darken.capod',
+        aab: '../app/build/outputs/bundle/gplayBeta/app-gplay-beta.aab',
         skip_upload_changelogs: 'false',
+        skip_upload_apk: 'true',
         skip_upload_images: 'true',
         skip_upload_screenshots: 'true',
         skip_upload_aab: 'true',
@@ -34,11 +37,14 @@ platform :android do
   end
 
   lane :production do
-    gradle(task: 'clean assembleGplayRelease')
+    gradle(task: 'clean bundleGplayRelease')
     sh "bash ./remove_unsupported_languages.sh"
     supply(
         track: 'beta',
+        package_name: 'eu.darken.capod',
+        aab: '../app/build/outputs/bundle/gplayRelease/app-gplay-release.aab',
         skip_upload_changelogs: 'false',
+        skip_upload_apk: 'true',
         skip_upload_images: 'true',
         skip_upload_screenshots: 'true',
         skip_upload_aab: 'true',

fastlane/metadata/android/en-US/changelogs/1031300.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031300)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031301.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031301)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031302.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031302)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031303.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031303)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031304.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031304)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031305.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031305)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/1031306.txt

@@ -0,0 +1,4 @@
+v1.3.13(1031306)
+• Updated translations
+• Updated internal dependencies
+• Tweaked placement of UI elements

fastlane/metadata/android/en-US/changelogs/default.txt

@@ -0,0 +1,3 @@
+Bugfixes and performance improvements.
+¯\_(ツ)_/¯
+

fastlane/metadata/android/en-US/full_description.txt

@@ -1,6 +1,7 @@
 CAPod is a companion app for AirPods.
 
 Features:
+
 * Battery level for pods and cases.
 * Charging status for pods and case.
 * Additional infos about connection, microphone and case.