Add Ability to close QuickCss

app/src/main/java/dev/vendicated/vencord/MainActivity.java

@@ -62,7 +62,10 @@ public class MainActivity extends Activity {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK && wv != null) {
-            runOnUiThread(() -> wv.evaluateJavascript("VencordMobile.onBackPress()", null));
+            runOnUiThread(() -> wv.evaluateJavascript("VencordMobile.onBackPress()", r -> {
+                if ("false".equals(r))
+                    this.onBackPressed ();
+            }));
             return true;
         }
         return super.onKeyDown(keyCode, event);

app/src/main/java/dev/vendicated/vencord/VencordNative.java

@@ -19,6 +19,7 @@ public class VencordNative {
             if (wv.canGoBack())
                 wv.goBack();
             else
+                // no idea what i was smoking when I wrote this
                 activity.getActionBar();
         });
     }

app/src/main/res/raw/vencord_mobile.js

@@ -1,13 +1,37 @@
 !(() => {
-    const { findLazy, Common } = Vencord.Webpack;
+    const { findLazy, Common, onceReady } = Vencord.Webpack;
     const ModalEscapeHandler = findLazy(m => m.binds?.length === 1 && m.binds[0] === "esc");
 
-    window.VencordMobile = {
+    let isSidebarOpen = false;
-        onBackPress() {
+    onceReady.then(() => {
-            // false implies modal closed
+        Common.FluxDispatcher.subscribe("MOBILE_WEB_SIDEBAR_OPEN", () => {
-            if (ModalEscapeHandler.action() === false) return;
+            isSidebarOpen = true;
+        });
+        Common.FluxDispatcher.subscribe("MOBILE_WEB_SIDEBAR_CLOSE", () => {
+            isSidebarOpen = false;
+        });
+    });
 
+    window.VencordMobile = {
+        // returns true if an action was taken, false if the java side should handle the back press
+        onBackPress() {
+            // false means modal closed (no further action rewuired?)
+            if (ModalEscapeHandler.action() === false) return true;
+
+            // try to close quick css window if open
+            const quickCssWin = window.__VENCORD_MONACO_WIN__?.deref();
+            if (quickCssWin && !quickCssWin.closed) {
+                quickCssWin.close();
+                delete window.__VENCORD_MONACO_WIN__;
+                return true;
+            }
+
+            if (!isSidebarOpen) {
                 Common.FluxDispatcher.dispatch({ type: "MOBILE_WEB_SIDEBAR_OPEN" });
+                return true;
+            }
+
+            return false;
         }
     };
 })();