Move titlebar.

src/pages/RevoltApp.tsx

@@ -10,6 +10,7 @@ import Notifications from "../context/revoltjs/Notifications";
 import StateMonitor from "../context/revoltjs/StateMonitor";
 import SyncManager from "../context/revoltjs/SyncManager";
 
+import { Titlebar } from "../components/native/Titlebar";
 import BottomNavigation from "../components/navigation/BottomNavigation";
 import LeftSidebar from "../components/navigation/LeftSidebar";
 import RightSidebar from "../components/navigation/RightSidebar";
@@ -43,6 +44,9 @@ export default function App() {
 
     return (
         <>
+            {window.isNative && !window.native.getConfig().frame && (
+                <Titlebar />
+            )}
             <OverlappingPanels
                 width="100vw"
                 height={

src/pages/app.tsx

@@ -8,8 +8,6 @@ import { CheckAuth } from "../context/revoltjs/CheckAuth";
 import Masks from "../components/ui/Masks";
 import Preloader from "../components/ui/Preloader";
 
-import { Titlebar } from "../components/native/Titlebar";
-
 const Login = lazy(() => import("./login/Login"));
 const RevoltApp = lazy(() => import("./RevoltApp"));
 
@@ -17,9 +15,6 @@ export function App() {
     return (
         <Context>
             <Masks />
-            {window.isNative && !window.native.getConfig().frame && (
-                <Titlebar />
-            )}
             {/* 
             // @ts-expect-error */}
             <Suspense fallback={<Preloader type="spinner" />}>

src/pages/developer/Developer.tsx

@@ -1,5 +1,4 @@
 import { Wrench } from "@styled-icons/boxicons-solid";
-import { observer } from "mobx-react-lite";
 
 import { useContext } from "preact/hooks";
 

src/pages/login/Login.tsx

@@ -11,6 +11,7 @@ import { AppContext } from "../../context/revoltjs/RevoltClient";
 
 import LocaleSelector from "../../components/common/LocaleSelector";
 
+import { Titlebar } from "../../components/native/Titlebar";
 import { APP_VERSION } from "../../version";
 import background from "./background.jpg";
 import { FormCreate } from "./forms/FormCreate";
@@ -23,6 +24,10 @@ export default function Login() {
     const client = useContext(AppContext);
 
     return (
+        <>
+            {window.isNative && !window.native.getConfig().frame && (
+                <Titlebar />
+            )}
             <div className={styles.login}>
                 <Helmet>
                     <meta name="theme-color" content={theme.background} />
@@ -70,5 +75,6 @@ export default function Login() {
                     style={{ background: `url('${background}')` }}
                 />
             </div>
+        </>
     );
 }