Merge branch 'cursor-review-implement' of https://github.com/CodeStorm-Hub/petsphere into cursor-review-implement

Author: syed-reza98

android/gradle.properties

@@ -1,7 +1,7 @@
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 # Android Gradle Plugin / Gradle do not run on JDK 26; without a JDK 17–21 toolchain the build fails with "26.0.2" as the only message.
-org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
+# org.gradle.java.home=C:\\Program Files\\Android\\Android Studio\\jbr
 # Enable parallel build to speed up the build process
 org.gradle.parallel=true
 # Enable the Gradle build cache to reuse outputs from previous builds
@@ -12,4 +12,4 @@ org.gradle.configureondemand=true
 org.gradle.daemon=true
 # Enable Gradle's build scan plugin for better insights into build performance
 # org.gradle.scan=true
-# org.gradle.java.home=/usr/lib/jvm/java-21-openjdk
+org.gradle.java.home=/usr/lib/jvm/java-21-openjdk