From a68a63d7960d81a015e1d0c93781f970dea89b86 Mon Sep 17 00:00:00 2001 From: sagarwal Date: Tue, 4 Aug 2026 14:19:06 +0530 Subject: [PATCH 1/3] Fix resource validation issues exposed by AGP --- app/src/main/res/layout/screen_edit_patient.xml | 2 +- app/src/main/res/layout/screen_facility_change.xml | 2 +- app/src/main/res/layout/screen_manual_patient_entry.xml | 2 +- .../res/layout/screen_registration_facility_selection.xml | 2 +- app/src/main/res/layout/screen_select_facility.xml | 2 +- app/src/main/res/layout/screen_teleconsult_record.xml | 2 +- .../res/layout/screen_teleconsult_share_prescription.xml | 4 ++-- app/src/main/res/layout/sheet_reassign_patient.xml | 2 +- app/src/main/res/layout/sheet_schedule_appointment.xml | 2 +- app/src/main/res/values-am-rET/strings.xml | 2 +- app/src/main/res/values-bn-rBD/strings.xml | 2 +- app/src/main/res/values-bn-rIN/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-hi-rIN/strings.xml | 2 +- app/src/main/res/values-kn-rIN/strings.xml | 2 +- app/src/main/res/values-mr-rIN/strings.xml | 2 +- app/src/main/res/values-om-rET/strings.xml | 2 +- app/src/main/res/values-pa-rIN/strings.xml | 2 +- app/src/main/res/values-si-rLK/strings.xml | 2 +- app/src/main/res/values-sid-rET/strings.xml | 2 +- app/src/main/res/values-so-rET/strings.xml | 2 +- app/src/main/res/values-ta-rIN/strings.xml | 2 +- app/src/main/res/values-ta-rLK/strings.xml | 2 +- app/src/main/res/values-te-rIN/strings.xml | 2 +- app/src/main/res/values-ti-rET/strings.xml | 2 +- app/src/main/res/values/attrs.xml | 6 +++--- app/src/main/res/values/strings.xml | 2 +- 27 files changed, 30 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/layout/screen_edit_patient.xml b/app/src/main/res/layout/screen_edit_patient.xml index 0cc4582fba9..e7fcea5bbb4 100644 --- a/app/src/main/res/layout/screen_edit_patient.xml +++ b/app/src/main/res/layout/screen_edit_patient.xml @@ -400,7 +400,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/patientedit_save_patient" - app:buttonState="in-progress" /> + app:buttonState="in_progress" /> diff --git a/app/src/main/res/layout/screen_facility_change.xml b/app/src/main/res/layout/screen_facility_change.xml index c5ebecb04f3..c59f17cf997 100644 --- a/app/src/main/res/layout/screen_facility_change.xml +++ b/app/src/main/res/layout/screen_facility_change.xml @@ -13,6 +13,6 @@ android:id="@+id/facilityPickerView" android:layout_width="match_parent" android:layout_height="match_parent" - app:pickFrom="in-current-group" /> + app:pickFrom="in_current_group" /> diff --git a/app/src/main/res/layout/screen_manual_patient_entry.xml b/app/src/main/res/layout/screen_manual_patient_entry.xml index d29f366da61..bd6bc4d17ed 100644 --- a/app/src/main/res/layout/screen_manual_patient_entry.xml +++ b/app/src/main/res/layout/screen_manual_patient_entry.xml @@ -392,7 +392,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/patiententry_save_patient" - app:buttonState="in-progress" /> + app:buttonState="in_progress" /> diff --git a/app/src/main/res/layout/screen_registration_facility_selection.xml b/app/src/main/res/layout/screen_registration_facility_selection.xml index 63932c37437..138d39aed5a 100644 --- a/app/src/main/res/layout/screen_registration_facility_selection.xml +++ b/app/src/main/res/layout/screen_registration_facility_selection.xml @@ -8,6 +8,6 @@ android:id="@+id/facilityPickerView" android:layout_width="match_parent" android:layout_height="match_parent" - app:pickFrom="all-facilities" /> + app:pickFrom="all_facilities" /> diff --git a/app/src/main/res/layout/screen_select_facility.xml b/app/src/main/res/layout/screen_select_facility.xml index ae537388807..6709e73e6fc 100644 --- a/app/src/main/res/layout/screen_select_facility.xml +++ b/app/src/main/res/layout/screen_select_facility.xml @@ -10,6 +10,6 @@ android:id="@+id/facilityPickerView" android:layout_width="match_parent" android:layout_height="match_parent" - app:pickFrom="all-facilities" /> + app:pickFrom="all_facilities" /> diff --git a/app/src/main/res/layout/screen_teleconsult_record.xml b/app/src/main/res/layout/screen_teleconsult_record.xml index 6366a437aa7..2bdeda63b35 100644 --- a/app/src/main/res/layout/screen_teleconsult_record.xml +++ b/app/src/main/res/layout/screen_teleconsult_record.xml @@ -167,7 +167,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/screen_teleconsult_record_done" - app:buttonState="in-progress" + app:buttonState="in_progress" app:icon="@drawable/ic_done_24dp" app:iconGravity="textStart" /> diff --git a/app/src/main/res/layout/screen_teleconsult_share_prescription.xml b/app/src/main/res/layout/screen_teleconsult_share_prescription.xml index 6b47f72d3c5..04af6a91f29 100644 --- a/app/src/main/res/layout/screen_teleconsult_share_prescription.xml +++ b/app/src/main/res/layout/screen_teleconsult_share_prescription.xml @@ -221,7 +221,7 @@ android:layout_marginEnd="@dimen/spacing_8" android:layout_marginBottom="@dimen/spacing_16" android:text="@string/screen_teleconsult_share_prescription_download" - app:buttonState="in-progress" + app:buttonState="in_progress" app:icon="@drawable/ic_prescription_download" app:iconGravity="textStart" app:layout_constraintEnd_toStartOf="@+id/shareButton" @@ -238,7 +238,7 @@ android:layout_marginEnd="@dimen/spacing_16" android:layout_marginBottom="@dimen/spacing_16" android:text="@string/screen_teleconsult_share_prescription_share" - app:buttonState="in-progress" + app:buttonState="in_progress" app:icon="@drawable/ic_whatsapp" app:layout_constraintBottom_toTopOf="@+id/doneButton" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/sheet_reassign_patient.xml b/app/src/main/res/layout/sheet_reassign_patient.xml index 49df6969832..e340c1e6ad7 100644 --- a/app/src/main/res/layout/sheet_reassign_patient.xml +++ b/app/src/main/res/layout/sheet_reassign_patient.xml @@ -79,7 +79,7 @@ android:layout_weight="1" android:gravity="center" android:text="@string/change_patient_facility" - app:buttonState="in-progress" + app:buttonState="in_progress" tools:ignore="ButtonStyle" /> diff --git a/app/src/main/res/layout/sheet_schedule_appointment.xml b/app/src/main/res/layout/sheet_schedule_appointment.xml index 691ee56947c..b5bba49a375 100644 --- a/app/src/main/res/layout/sheet_schedule_appointment.xml +++ b/app/src/main/res/layout/sheet_schedule_appointment.xml @@ -158,7 +158,7 @@ android:layout_weight="1" android:gravity="center" android:text="@string/scheduleappointment_done" - app:buttonState="in-progress" + app:buttonState="in_progress" tools:ignore="ButtonStyle" /> ምንም የዘገየ ታካሚ የለም ለቀጣይ የደም ግፊት ንባብ መርሃግብር ተቀጥረው ያልመጡትን ታካሚዎችመደወል ይችላሉ - %s, %s + %1$s, %2$s %s ቀን አልduል %s ቀናት ጊዜው አልፎበታል diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 6a188b17afc..e1f80811171 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -259,7 +259,7 @@ সময়াতীত হওয়া কোন রোগী নেই যে রোগীরা ফলো আপ রক্তচাপ মাপার জন্য তাদের পূর্বনির্ধারিত সাক্ষাৎকার মিস করেছে আপনি সেই রোগীদের ফোন করতে পারবেন। - %s, %s + %1$s, %2$s %s দিন আগে সময় পার হয়ে গেছে %s দিন আগে সময় পার হয়ে গেছে diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml index 05ac0a93d22..5b0ee25f70c 100644 --- a/app/src/main/res/values-bn-rIN/strings.xml +++ b/app/src/main/res/values-bn-rIN/strings.xml @@ -259,7 +259,7 @@ সময় পার হয়ে যাওয়া কোন রোগী নেই যে রোগীরা ফলো আপ রক্তচাপ মাপার জন্য তাদের পূর্বনির্ধারিত সাক্ষাৎকার মিস করেছে আপনি সেই রোগীদের ফোন করতে পারবেন। - %s, %s + %1$s, %2$s %s দিন আগে সময় পার হয়ে গেছে %s দিন আগে সময় পার হয়ে গেছে diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index cbe305ca6cf..1311a73e7b5 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -259,7 +259,7 @@ No hay pacientes atrasados Podrá llamar a los pacientes que no acudan a sus visitas programadas para seguimiento de lectura de presión arterial - %s, %s + %1$s, %2$s %s día de atraso %s días de atraso diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index 906fa235520..305ff109f75 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -259,7 +259,7 @@ किसी रोगी अतिदेय सूची में नहीं आप उन रोगियों को कॉल कर पाएंगे जो अपने फ़ॉलो-अप रक्तचाप रीडिंग करवाने के लिए अपनी नियत विज़िट पर नहीं आए। - %s, %s + %1$s, %2$s %s दिन बाकी है %s दिन बाकी है diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml index 46e4ce112eb..27ec5f83e76 100644 --- a/app/src/main/res/values-kn-rIN/strings.xml +++ b/app/src/main/res/values-kn-rIN/strings.xml @@ -259,7 +259,7 @@ ಯಾವ ರೋಗಿಗಳು ಬಾಕಿ ಇಲ್ಲ ನೀವು ರಕ್ತದ ಒತ್ತಡದ ರೀಡಿಂಗ್‌ನ ಫಾಲೋ ಅಪ್ ಮಾಡುವುದಕ್ಕಾಗಿ ತಮ್ಮ ನಿಗದಿತ ಭೇಟಿಯನ್ನು ತಪ್ಪಿಸಿಕೊಂಡ ರೋಗಿಗಳಿಗೆ ಕರೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತದೆ. - %s, %s + %1$s, %2$s %s ದಿನದಷ್ಟು ತಡವಾಗಿದೆ %s ದಿನಗಳಷ್ಟು ತಡವಾಗಿದೆ diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml index 9ac96f6f111..a2b0c8202e1 100644 --- a/app/src/main/res/values-mr-rIN/strings.xml +++ b/app/src/main/res/values-mr-rIN/strings.xml @@ -259,7 +259,7 @@ कोणतेही ओव्‍हरड्यू रूग्ण नाहीत फॉलो-अप रक्‍त्‍दाब रिडिंगसाठी शेड्यूल भेट विसरलेल्‍या रूग्णांना तुम्‍ही कॉल करू शकाल. - %s, %s + %1$s, %2$s %s दिवस थकीत %s दिवस थकीत diff --git a/app/src/main/res/values-om-rET/strings.xml b/app/src/main/res/values-om-rET/strings.xml index 9bc3c0e5831..bc9d1375dad 100644 --- a/app/src/main/res/values-om-rET/strings.xml +++ b/app/src/main/res/values-om-rET/strings.xml @@ -260,7 +260,7 @@ Dhukkubsattoonni irra darbe hin jiran Dhukkubsattoota sagantaa hordoffii dubbisa dhiibbaa dhiigaa isaanii bilbiluufii ni dandeessa. - %s, %s + %1$s, %2$s Guyyaa %s irra darbe Guyyoota %s irra darbe diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml index 28512f38146..592e97c0265 100644 --- a/app/src/main/res/values-pa-rIN/strings.xml +++ b/app/src/main/res/values-pa-rIN/strings.xml @@ -259,7 +259,7 @@ ਕੋਈ ਮਰੀਜ਼ ਓਵਰਡਿਊ ਨਹੀਂ ਹਨ ਤੁਸੀਂ ਇੱਕ ਫੋਲੋ-ਅੱਪ ਬਲੱਡ ਪ੍ਰੈਸ਼ਰ ਰੀਡਿੰਗ ਲਈ ਅਜਿਹੇ ਮਰੀਜ਼ਾਂ ਨੂੰ ਬੁਲਾਉਣ ਦੇ ਯੋਗ ਹੋਵੋਗੇ ਜੋ ਆਪਣੀ ਨਿਰਧਾਰਤ ਮੁਲਾਕਾਤ ਖੁੰਝਾ ਦਿੰਦੇ ਹਨ। - %s, %s + %1$s, %2$s %s ਦਿਨ ਓਵਰਡਿਊ ਹਨ %s ਦਿਨ ਓਵਰਡਿਊ ਹਨ diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index 7fb032ae36c..bc892880fe3 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -259,7 +259,7 @@ තවදුරටත් ඉතිරි වූ කිසිදු රෝගියකු නැත රුධිර පීඩනය බැලීමේ පසු විපරම් හමුව මඟ හැරුණු රෝගීන්ට ඇමතීමට ඔබට හැකි වනු ඇත. - %s, %s + %1$s, %2$s දින %s ක කාලයක් ඉකුත් වී ඇත දින %s ක කාලයක් ඉකුත් වී ඇත diff --git a/app/src/main/res/values-sid-rET/strings.xml b/app/src/main/res/values-sid-rET/strings.xml index 6eb0d8c5633..0be640f274c 100644 --- a/app/src/main/res/values-sid-rET/strings.xml +++ b/app/src/main/res/values-sid-rET/strings.xml @@ -259,7 +259,7 @@ Shima yanara keshino xiwamanichi dino Qaxarote bara sorino xiwamanicho Mundeete xiiwo mageshitero la’ate konini anichite wosha danidato. - %s, %s + %1$s, %2$s %s day overdue %s days overdue diff --git a/app/src/main/res/values-so-rET/strings.xml b/app/src/main/res/values-so-rET/strings.xml index c88c2a90c7f..e3581edc85b 100644 --- a/app/src/main/res/values-so-rET/strings.xml +++ b/app/src/main/res/values-so-rET/strings.xml @@ -259,7 +259,7 @@ Ma jiraan bukaanno daahay Waxaad awoodi doontaa inaad wacdo bukaanada ka baaqda booqashadooda jadwalka ah ee akhriska cadaadiska dhiigga karka ee soo socda. - %s, %s + %1$s, %2$s %smaalin dhaaftay %smaalmaha la dhaafiyay diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml index f07c2084611..32575b02b52 100644 --- a/app/src/main/res/values-ta-rIN/strings.xml +++ b/app/src/main/res/values-ta-rIN/strings.xml @@ -259,7 +259,7 @@ குறித்த தேதிக்குள் வராதவர்கள் இல்லை மீண்டும் இரத்த அழுத்த ரீடிங் எடுப்பதற்காகத் திட்டமிடப்பட்ட தேதியைத் தவறவிட்ட நோயாளிகளை நீங்கள் அழைக்க முடியும். - %s, %s + %1$s, %2$s %s நாள் தாண்டிவிட்டது %s நாட்கள் தாண்டிவிட்டன diff --git a/app/src/main/res/values-ta-rLK/strings.xml b/app/src/main/res/values-ta-rLK/strings.xml index e635ea4e2e9..300cef5f660 100644 --- a/app/src/main/res/values-ta-rLK/strings.xml +++ b/app/src/main/res/values-ta-rLK/strings.xml @@ -259,7 +259,7 @@ எந்த நோயாளர்களும் தாமதமாகவில்லை பின்தொடர்தல் இரத்த அழுத்த அளவீட்டிற்காகத் திட்டமிடப்பட்ட வருகையைத் தவறவிட்ட நோயாளர்களை நீங்கள் அழைக்கலாம். - %s, %s + %1$s, %2$s குறித்த நாளை விட %s நாட்கள் அதிகம் குறித்த நாளை விட %s நாட்கள் அதிகம் diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml index 3e55f45de59..7789d38421d 100644 --- a/app/src/main/res/values-te-rIN/strings.xml +++ b/app/src/main/res/values-te-rIN/strings.xml @@ -259,7 +259,7 @@ గడువు దాటిన రోగులు లేరు షెడ్యూల్ చేసిన సందర్శనకు హాజరుకాని రోగులకు మీరు కాల్ చేసి ఫాలో-అప్ రక్తపోటు రీడింగ్ కోసం రావాలని కోరవచ్చు. - %s, %s + %1$s, %2$s %s రోజు గడువు మించింది %s రోజుల గడువు మించింది diff --git a/app/src/main/res/values-ti-rET/strings.xml b/app/src/main/res/values-ti-rET/strings.xml index 390d681d435..202803dc783 100644 --- a/app/src/main/res/values-ti-rET/strings.xml +++ b/app/src/main/res/values-ti-rET/strings.xml @@ -259,7 +259,7 @@ ዝደንጎየ ተሓካሚ የለን ንምክትታል ፀቕጢ ደም ቆጸራ ተመዲቡሎም ዝነበሩ እሞ ዘይመፅኡ ተሓከምቲ ክትድውለሎም ትኽእል ኢኻ/ኺ። - %s, %s + %1$s, %2$s %s መዓልቲ ደንጉዩ %s መዓልታታ ደንጉዩ diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index f844c1b812c..f1abb0d8dca 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -35,7 +35,7 @@ - + @@ -43,8 +43,8 @@ - - + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 836a5011642..0185a00bca2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -316,7 +316,7 @@ No patients overdue You will be able to call patients who miss their scheduled visit for a follow-up blood pressure reading. - %s, %s + %1$s, %2$s %s day overdue %s days overdue From dc073065d3e40d6456c1ef909f092c96e2aebdf8 Mon Sep 17 00:00:00 2001 From: sagarwal Date: Tue, 4 Aug 2026 14:19:12 +0530 Subject: [PATCH 2/3] Remove android.enableAppCompileTimeRClass compatibility flag --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 6c4b0e6a68a..c059e34aa07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,6 +50,5 @@ org.gradle.unsafe.configuration-cache=true # AGP 9 compatibility flags (temporary) # Remove gradually before AGP 10 android.uniquePackageNames=false -android.enableAppCompileTimeRClass=false android.r8.optimizedResourceShrinking=false From 1b3b776a8d662111fa64cc4b1e97318a8fe84a91 Mon Sep 17 00:00:00 2001 From: sagarwal Date: Tue, 4 Aug 2026 14:25:57 +0530 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41a2c2a9526..80171b62882 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Bump AndroidX Benchmark to v1.5.0-beta01 - Bump Sentry to v8.51.0 - Bump Sentry Android to v6.17.0 +- Remove `android.enableAppCompileTimeRClass` compatibility flag ## 2026.08.03