codeplay-common 3.1.8 → 3.1.9

package/files/buildCodeplay/{codeplayBeforeBuild-6.0.js → codeplayBeforeBuild-6.1.js}

@@ -2117,6 +2117,113 @@ validateAndRestoreSignDetails()
 
 execSync('node buildCodeplay/fix-onesignal-plugin.js', { stdio: 'inherit' });
 
+
+
+
+
+
+
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin START ###############################
+
+
+const filePath = path.join(
+  __dirname,
+  "../node_modules/@capacitor/android/capacitor/src/main/java/com/getcapacitor/plugin/SystemBars.java"
+);
+
+// 🔍 OLD BLOCK (anchor)
+const OLD_BLOCK = `if (shouldPassthroughInsets) {
+                // We need to correct for a possible shown IME
+                v.setPadding(0, 0, 0, keyboardVisible ? imeInsets.bottom : 0);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+                    Insets safeAreaInsets = calcSafeAreaInsets(insets);
+                    injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+                }
+
+                return new WindowInsetsCompat.Builder(insets)
+                    .setInsets(
+                        WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.displayCutout(),
+                        Insets.of(
+                            systemBarsInsets.left,
+                            systemBarsInsets.top,
+                            systemBarsInsets.right,
+                            getBottomInset(systemBarsInsets, keyboardVisible)
+                        )
+                    )
+                    .build();
+            }`;
+
+// ✅ NEW BLOCK
+const NEW_BLOCK = `if (shouldPassthroughInsets) {
+    /* 🔴 ORIGINAL CODE (COMMENTED FOR SAFETY)
+${OLD_BLOCK.split("\n").map(line => "    " + line).join("\n")}
+    */
+
+    // ✅ NEW LOGIC (CUSTOM FIX)
+    v.setPadding(0, 0, 0, 0);
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && hasViewportCover && insetHandlingEnabled) {
+        Insets safeAreaInsets = calcSafeAreaInsets(insets);
+        injectSafeAreaCSS(safeAreaInsets.top, safeAreaInsets.right, safeAreaInsets.bottom, safeAreaInsets.left);
+    }
+
+    return insets; // WebView handles everything
+}`;
+
+// 🚨 ERROR MESSAGE
+const ERROR_MSG = `
+❌ Capacitor SystemBars.java structure changed!
+
+Plugin: @capacitor/android
+
+👉 Expected code block not found.
+
+This usually means Capacitor updated internally.
+
+Please:
+1. Open SystemBars.java
+2. Update patch script
+3. Re-run build
+
+⛔ Build stopped.
+`;
+
+function patchFile() {
+  if (!fs.existsSync(filePath)) {
+    console.error("❌ SystemBars.java not found!");
+    process.exit(1);
+  }
+
+  let content = fs.readFileSync(filePath, "utf8");
+
+  // ✅ Already patched?
+  if (content.includes("🔴 ORIGINAL CODE (COMMENTED FOR SAFETY)")) {
+    console.log("✅ Already SystemBars.java patched. Skipping...");
+    return;
+  }
+
+  // 🔍 Check old block exists
+  if (!content.includes(OLD_BLOCK)) {
+    console.error(ERROR_MSG);
+    process.exit(1);
+  }
+
+  // 🔁 Replace
+  const updated = content.replace(OLD_BLOCK, NEW_BLOCK);
+
+  fs.writeFileSync(filePath, updated, "utf8");
+
+  console.log("✅ SystemBars.java patched (comment + new logic)!");
+}
+
+patchFile();
+
+//##################################  SystemBars.java update for "@capacitor/android": "^8.3.0" plugin END ###############################
+
+
+
+
 /*
 Release Notes