Match navbar to the backgroundColor

DerGoogler · Oct 27, 2023 · 344841d · 344841d
1 parent de9a5c4
commit 344841d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/Android/app/default/release/output-metadata.json b/Android/app/default/release/output-metadata.json
@@ -20,52 +20,52 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "x86_64"
         }
       ],
       "attributes": [],
       "versionCode": 185,
       "versionName": "1.8.5",
-      "outputFile": "app-default-x86-release.apk"
+      "outputFile": "app-default-x86_64-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86_64"
+          "value": "armeabi-v7a"
         }
       ],
       "attributes": [],
       "versionCode": 185,
       "versionName": "1.8.5",
-      "outputFile": "app-default-x86_64-release.apk"
+      "outputFile": "app-default-armeabi-v7a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "armeabi-v7a"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
       "versionCode": 185,
       "versionName": "1.8.5",
-      "outputFile": "app-default-armeabi-v7a-release.apk"
+      "outputFile": "app-default-arm64-v8a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86"
         }
       ],
       "attributes": [],
       "versionCode": 185,
       "versionName": "1.8.5",
-      "outputFile": "app-default-arm64-v8a-release.apk"
+      "outputFile": "app-default-x86-release.apk"
     }
   ],
   "elementType": "File"

diff --git a/Website/src/activitys/PicturePreviewActivity.tsx b/Website/src/activitys/PicturePreviewActivity.tsx
@@ -21,9 +21,7 @@ const PicturePreviewActivity = () => {
   return (
     <Page
       modifier="noshadow"
-      backgroundStyle={{
-        backgroundColor: "black",
-      }}
+      backgroundStyle="#000000"
       renderToolbar={renderToolbar}
     >
       <TransformWrapper>

diff --git a/Website/src/activitys/TerminalActivity.tsx b/Website/src/activitys/TerminalActivity.tsx
@@ -140,9 +140,7 @@ const TerminalActivity = () => {
       onShow={install}
       modifier="noshadow"
       renderToolbar={renderToolbar}
-      backgroundStyle={{
-        backgroundColor: "black",
-      }}
+      backgroundStyle="#000000"
     >
       <div
         ref={ref}

diff --git a/Website/src/components/onsenui/Page.tsx b/Website/src/components/onsenui/Page.tsx
@@ -14,7 +14,7 @@ interface NativeUIColors {
 
 interface HTMLPage {
   sx?: SxProps;
-  backgroundStyle?: React.CSSProperties;
+  backgroundStyle?: React.CSSProperties["backgroundColor"];
   modifier?: string;
   renderModal?: RenderFunction;
   renderToolbar?: RenderFunction;
@@ -40,10 +40,19 @@ const _Page = React.forwardRef<HTMLElement, HTMLPage>((props, ref) => {
   const { context } = useActivity();
   const { renderToolbar, renderBottomToolbar, renderModal, renderFixed, sx, children, ...rest } = props;
 
+  React.useEffect(() => {
+    if (props.backgroundStyle) {
+      os.setNavigationBarColor(props.backgroundStyle);
+      return () => {
+        os.setNavigationBarColor(theme.palette.background.default);
+      };
+    }
+  }, [props.backgroundStyle]);
+
   return (
     <HTMLPage {...rest} ref={ref}>
       {renderToolbar && renderToolbar(ref, context)}
-      <Box className="page__background" sx={props.backgroundStyle}></Box>
+      <Box className="page__background" sx={{ backgroundColor: props.backgroundStyle }}></Box>
       <Box className="page__content" sx={sx}>
         {children}
       </Box>