From 344841dee7e71ba3e104558e4ca923eafbc4bb0d Mon Sep 17 00:00:00 2001 From: Der_Googler <54764558+DerGoogler@users.noreply.github.com> Date: Sat, 28 Oct 2023 01:08:55 +0200 Subject: [PATCH] Match navbar to the backgroundColor --- Android/app/default/release/output-metadata.json | 16 ++++++++-------- Website/src/activitys/PicturePreviewActivity.tsx | 4 +--- Website/src/activitys/TerminalActivity.tsx | 4 +--- Website/src/components/onsenui/Page.tsx | 13 +++++++++++-- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Android/app/default/release/output-metadata.json b/Android/app/default/release/output-metadata.json index 5406d94d..e8c18358 100644 --- 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 index 2e5f6916..02244e56 100644 --- a/Website/src/activitys/PicturePreviewActivity.tsx +++ b/Website/src/activitys/PicturePreviewActivity.tsx @@ -21,9 +21,7 @@ const PicturePreviewActivity = () => { return ( diff --git a/Website/src/activitys/TerminalActivity.tsx b/Website/src/activitys/TerminalActivity.tsx index 6328f5f8..8fea36be 100644 --- 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" >
((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 ( {renderToolbar && renderToolbar(ref, context)} - + {children}