Merge pull request 'haroon_dev' (#284) from haroon_dev into master

Reviewed-on: https://34.17.182.140/Haroon6138/HMG_Patient_App_New/pulls/284
master
Haroon6138 22 hours ago
commit 2a4b80ff99

@ -22,7 +22,8 @@ android {
namespace = "com.cloudsolutions.HMGPatientApp" namespace = "com.cloudsolutions.HMGPatientApp"
compileSdk = 36 compileSdk = 36
// Using NDK 26 for better compatibility with Zoom SDK native libraries // Using NDK 26 for better compatibility with Zoom SDK native libraries
ndkVersion = "27.0.12077973" // ndkVersion = "27.0.12077973"
ndkVersion = "28.2.13676358"
// ndkVersion = "25.1.8937393" // ndkVersion = "25.1.8937393"
sourceSets { sourceSets {
@ -105,7 +106,8 @@ android {
"lib/arm64-v8a/libc++_shared.so", "lib/arm64-v8a/libc++_shared.so",
"**/*.so" "**/*.so"
) )
useLegacyPackaging = true // useLegacyPackaging = true
useLegacyPackaging = false
// Keep Zoom SDK libraries unstripped to preserve symbols // Keep Zoom SDK libraries unstripped to preserve symbols
keepDebugSymbols += listOf( keepDebugSymbols += listOf(
"*/libzoom_util.so", "*/libzoom_util.so",
@ -177,14 +179,15 @@ dependencies {
// implementation("androidx.room:room-runtime:$room_version") // implementation("androidx.room:room-runtime:$room_version")
// annotationProcessor("androidx.room:room-compiler:$room_version") // annotationProcessor("androidx.room:room-compiler:$room_version")
implementation("net.zetetic:android-database-sqlcipher:4.5.4") // implementation("net.zetetic:android-database-sqlcipher:4.5.4")
implementation("com.intuit.ssp:ssp-android:1.1.0") implementation("com.intuit.ssp:ssp-android:1.1.0")
implementation("com.intuit.sdp:sdp-android:1.1.0") implementation("com.intuit.sdp:sdp-android:1.1.0")
implementation("com.github.bumptech.glide:glide:4.16.0") implementation("com.github.bumptech.glide:glide:4.16.0")
annotationProcessor("com.github.bumptech.glide:compiler:4.16.0") annotationProcessor("com.github.bumptech.glide:compiler:4.16.0")
implementation("com.mapbox.maps:android:11.5.0") // implementation("com.mapbox.maps:android:11.5.0")
implementation("com.mapbox.maps:android-ndk27:11.22.0")
implementation("com.mapbox.mapboxsdk:mapbox-sdk-turf:7.3.1") implementation("com.mapbox.mapboxsdk:mapbox-sdk-turf:7.3.1")
// implementation("com.mapbox.maps:android:11.4.0") // implementation("com.mapbox.maps:android:11.4.0")
@ -208,7 +211,7 @@ dependencies {
implementation("androidx.appcompat:appcompat:1.7.1") implementation("androidx.appcompat:appcompat:1.7.1")
implementation("com.google.android.material:material:1.12.0") implementation("com.google.android.material:material:1.12.0")
implementation("pl.droidsonroids.gif:android-gif-drawable:1.2.25") implementation("pl.droidsonroids.gif:android-gif-drawable:1.2.29")
implementation("com.mapbox.mapboxsdk:mapbox-sdk-turf:7.3.1") implementation("com.mapbox.mapboxsdk:mapbox-sdk-turf:7.3.1")
androidTestImplementation("androidx.test:core:1.6.1") androidTestImplementation("androidx.test:core:1.6.1")

@ -42,6 +42,7 @@
tools:node="remove" /> tools:node="remove" />
<!-- Gallery/Photo permissions for Android 13+ (API 33+) --> <!-- Gallery/Photo permissions for Android 13+ (API 33+) -->
<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:node="remove" />-->
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" /> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" tools:node="remove" />

@ -2,7 +2,7 @@
android.enableR8=true android.enableR8=true
android.enableJetifier=true android.enableJetifier=true
android.useDeprecatedNdk=true android.useDeprecatedNdk=true
org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=1024m -XX:MaxMetaspaceSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.configureondemand=true org.gradle.configureondemand=true

@ -1814,7 +1814,7 @@
"bloodDonationService": "التبرع \n بالدم", "bloodDonationService": "التبرع \n بالدم",
"bookAppointmentService": "حجز\nموعد", "bookAppointmentService": "حجز\nموعد",
"pinchToZoom": "اضغط للتكبير", "pinchToZoom": "اضغط للتكبير",
"gotIt": "فهمت", "gotIt": "حسنا",
"zoomIntoDetails": "قم بالتكبير لرؤية التفاصيل", "zoomIntoDetails": "قم بالتكبير لرؤية التفاصيل",
"pinchWithTwoFingersToZoom": "اضغط بإصبعين للتكبير", "pinchWithTwoFingersToZoom": "اضغط بإصبعين للتكبير",
"dragToMoveAround": "اسحب للتحرك", "dragToMoveAround": "اسحب للتحرك",

@ -0,0 +1,110 @@
#!/bin/bash
# Check ELF .so alignment in APK for 16KB page size compatibility
# Files must have PT_LOAD segments aligned to 16384 bytes (0x4000)
APK="${1:-/Users/mohamedmekawy/Documents/Work/HMG_Patient_App_New/android/app/release/app-release.apk}"
LLVM_READELF="/Users/mohamedmekawy/Library/Android/sdk/ndk/28.2.13676358/toolchains/llvm/prebuilt/darwin-x86_64/bin/llvm-readelf"
EXTRACT_DIR="/tmp/apk_alignment_check"
REQUIRED_ALIGNMENT=16384 # 16 KB
echo "========================================"
echo " ELF Alignment Check for 16KB Page Size"
echo "========================================"
echo "APK: $APK"
echo ""
if [ ! -f "$APK" ]; then
echo "ERROR: APK not found at $APK"
exit 1
fi
# Clean and extract APK
rm -rf "$EXTRACT_DIR"
mkdir -p "$EXTRACT_DIR"
unzip -q "$APK" -d "$EXTRACT_DIR"
# Find all .so files
SO_FILES=$(find "$EXTRACT_DIR" -name "*.so")
if [ -z "$SO_FILES" ]; then
echo "No .so files found in APK."
exit 0
fi
FAILED=()
PASSED=()
for SO in $SO_FILES; do
RELATIVE="${SO#$EXTRACT_DIR/}"
# Check if it's a valid ELF
MAGIC=$(xxd -l 4 "$SO" 2>/dev/null | head -1)
if [[ "$MAGIC" != *"7f45 4c46"* ]]; then
continue
fi
# Use llvm-readelf from NDK
READELF_OUTPUT=$("$LLVM_READELF" -l "$SO" 2>/dev/null)
if [ -z "$READELF_OUTPUT" ]; then
echo "⚠️ SKIP (readelf unavailable): $RELATIVE"
continue
fi
# Extract LOAD segment alignments
MISALIGNED=false
while IFS= read -r line; do
if [[ "$line" == *"LOAD"* ]]; then
# Get the last field (Align column)
ALIGN=$(echo "$line" | awk '{print $NF}')
# Convert hex to decimal if needed
if [[ "$ALIGN" == 0x* ]]; then
ALIGN_DEC=$((ALIGN))
else
ALIGN_DEC=$ALIGN
fi
if [[ "$ALIGN_DEC" =~ ^[0-9]+$ ]]; then
if [ "$ALIGN_DEC" -lt "$REQUIRED_ALIGNMENT" ] && [ "$ALIGN_DEC" -gt 0 ]; then
MISALIGNED=true
ALIGN_KB=$((ALIGN_DEC / 1024))
echo "❌ FAIL (${ALIGN_KB}KB aligned): $RELATIVE"
break
fi
fi
fi
done <<< "$READELF_OUTPUT"
if [ "$MISALIGNED" = false ]; then
ALIGN_LINE=$(echo "$READELF_OUTPUT" | grep "LOAD" | head -1 | awk '{print $NF}')
echo "✅ PASS ($ALIGN_LINE aligned): $RELATIVE"
PASSED+=("$RELATIVE")
else
FAILED+=("$RELATIVE")
fi
done
echo ""
echo "========================================"
echo "SUMMARY"
echo "========================================"
echo "✅ Passed (16KB+ aligned): ${#PASSED[@]}"
echo "❌ Failed (< 16KB aligned): ${#FAILED[@]}"
if [ ${#FAILED[@]} -gt 0 ]; then
echo ""
echo "The following .so files are NOT 16KB page aligned:"
for f in "${FAILED[@]}"; do
echo " - $f"
done
echo ""
echo "These files will cause issues on Android 15+ devices with 16KB page size."
else
echo ""
echo "All .so files are 16KB page aligned. ✅"
fi
# Cleanup
rm -rf "$EXTRACT_DIR"

@ -1803,6 +1803,14 @@ abstract class LocaleKeys {
static const watchUsOnYoutube = 'watchUsOnYoutube'; static const watchUsOnYoutube = 'watchUsOnYoutube';
static const connectOnLinkedin = 'connectOnLinkedin'; static const connectOnLinkedin = 'connectOnLinkedin';
static const riskFactorPageTitle = 'riskFactorPageTitle'; static const riskFactorPageTitle = 'riskFactorPageTitle';
static const bloodDonationService = 'bloodDonationService';
static const bookAppointmentService = 'bookAppointmentService';
static const pinchToZoom = 'pinchToZoom';
static const gotIt = 'gotIt';
static const zoomIntoDetails = 'zoomIntoDetails';
static const pinchWithTwoFingersToZoom = 'pinchWithTwoFingersToZoom';
static const dragToMoveAround = 'dragToMoveAround';
static const startExploring = 'startExploring';
static const symptomsCheckSuggestions = 'symptomsCheckSuggestions'; static const symptomsCheckSuggestions = 'symptomsCheckSuggestions';
static const appointmentArrived = 'appointmentArrived'; static const appointmentArrived = 'appointmentArrived';
static const calendarPermissionAlertForAppointment = 'calendarPermissionAlertForAppointment'; static const calendarPermissionAlertForAppointment = 'calendarPermissionAlertForAppointment';

@ -44,8 +44,8 @@ class _OrganSelectorPageState extends State<OrganSelectorPage> {
} }
Future<void> _checkAndShowTutorial() async { Future<void> _checkAndShowTutorial() async {
final hasSeenTutorial = cacheService.getBool(key: CacheConst.organSelectorTutorialShown) ?? false; // final hasSeenTutorial = cacheService.getBool(key: CacheConst.organSelectorTutorialShown) ?? false;
if (!hasSeenTutorial) { // if (!hasSeenTutorial) {
// Show tutorial after a short delay to ensure the screen is fully built // Show tutorial after a short delay to ensure the screen is fully built
await Future.delayed(const Duration(milliseconds: 500)); await Future.delayed(const Duration(milliseconds: 500));
if (mounted) { if (mounted) {
@ -53,7 +53,7 @@ class _OrganSelectorPageState extends State<OrganSelectorPage> {
_showTutorial = true; _showTutorial = true;
}); });
} }
} // }
} }
void _onTutorialComplete() async { void _onTutorialComplete() async {

@ -2,8 +2,8 @@ name: hmg_patient_app_new
description: "New HMG Patient App" description: "New HMG Patient App"
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 0.0.19+18 #version: 0.0.22+21
#version: 0.0.1+18 version: 0.0.1+20
environment: environment:
sdk: ">=3.6.0 <4.0.0" sdk: ">=3.6.0 <4.0.0"

Loading…
Cancel
Save