diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 7f140512..2ae3d18d 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -8,6 +8,7 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:usesCleartextTraffic="true" + android:fitsSystemWindows="true" android:theme="@style/AppTheme"> + className={clsx( + "border-ink-200 dark:border-ink-300 text-ink-700 bg-canvas-50 fixed inset-x-0 bottom-0 z-50 flex select-none items-center justify-between border-t-2 text-xs lg:hidden sidebar-nav", + 'safe-bottom', + )} + > {navigationOptions.map((item) => ( ) { + console.log('isAndroidWebView app:', isAndroidWebView()) useEffect(printBuildInfo, []) useHasLoaded() @@ -147,7 +150,7 @@ function MyApp({Component, pageProps}: AppProps) { /> diff --git a/web/pages/_document.tsx b/web/pages/_document.tsx index a69ebe39..e78f9cd7 100644 --- a/web/pages/_document.tsx +++ b/web/pages/_document.tsx @@ -1,6 +1,7 @@ import {Head, Html, Main, NextScript} from 'next/document' import {ENV_CONFIG, IS_DEPLOYED} from 'common/envs/constants' import Script from 'next/script' +import clsx from "clsx"; export default function Document() { return ( @@ -40,7 +41,10 @@ export default function Document() { } catch(e){} })();` }}/>} - +
diff --git a/web/styles/globals.css b/web/styles/globals.css index 8705c272..31d82ff7 100644 --- a/web/styles/globals.css +++ b/web/styles/globals.css @@ -448,4 +448,16 @@ ol > li::marker { font-weight: 600; font-size: 1em; color: #374151; /* pick a visible color */ -} \ No newline at end of file +} + +.app-content { + padding-top: calc(env(safe-area-inset-top) + 30px); + /*padding-bottom: env(safe-area-inset-bottom);*/ + box-sizing: border-box; /* ensure padding doesn’t break layout */ +} + +.safe-bottom { + /*bottom: env(safe-area-inset-bottom);*/ + bottom: calc(env(safe-area-inset-bottom) + 30px); +} +