Merge pull request #28 from luke-/25-topbar-grey-color

Set Topbar to themeColor from manifest
humhub · Feb 2, 2023 · 9867774 · 9867774
2 parents 08ed997 + a446359
commit 9867774
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -11,12 +11,9 @@ class MyApp extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return const MaterialApp(
       debugShowCheckedModeBanner: false,
-      theme: ThemeData(
-        primaryColor: const Color(0xff21A1B3),
-      ),
-      home: const Redirector(),
+      home: Redirector(),
     );
   }
 }
diff --git a/lib/pages/web_view.dart b/lib/pages/web_view.dart
@@ -27,13 +27,12 @@ class WebViewAppState extends ConsumerState<WebViewApp> {
 
   @override
   Widget build(BuildContext context) {
-    return SafeArea(
-      child: WillPopScope(
-        onWillPop: () => webViewController.exitApp(context, ref),
-        child: Scaffold(
-            key: scaffoldKey,
-            body: WebViewWidget(controller: webViewController)),
-      ),
+    return WillPopScope(
+      onWillPop: () => webViewController.exitApp(context, ref),
+      child: Scaffold(
+          key: scaffoldKey,
+          backgroundColor: HexColor(widget.manifest.themeColor),
+          body: SafeArea(child: WebViewWidget(controller: webViewController))),
     );
   }
 }