6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 7f7e5c75
Changed files
.../main/kotlin/com/comwell/phoenix/MainActivity.kt | 2 +- .../app/src/main/res/values-night-v31/styles.xml | 7 +------ .../android/app/src/main/res/values-night/styles.xml | 7 +------ .../android/app/src/main/res/values-v31/styles.xml | 7 +------ .../android/app/src/main/res/values/styles.xml | 9 +-------- comwell_key_app/lib/main.dart | 3 +-- comwell_key_app/lib/overview/overview_page.dart | 18 +++++++++++++++--- 7 files changed, 21 insertions(+), 32 deletions(-)
Diff
diff --git a/comwell_key_app/android/app/src/main/kotlin/com/comwell/phoenix/MainActivity.kt b/comwell_key_app/android/app/src/main/kotlin/com/comwell/phoenix/MainActivity.kt
index 7698d9e0..27b6707b 100644
--- a/comwell_key_app/android/app/src/main/kotlin/com/comwell/phoenix/MainActivity.kt
+++ b/comwell_key_app/android/app/src/main/kotlin/com/comwell/phoenix/MainActivity.kt
@@ -2,4 +2,4 @@ package com.comwell.phoenix
import io.flutter.embedding.android.FlutterFragmentActivity
-class MainActivity: FlutterFragmentActivity()
+class MainActivity: FlutterFragmentActivity()
\ No newline at end of file
diff --git a/comwell_key_app/android/app/src/main/res/values-night-v31/styles.xml b/comwell_key_app/android/app/src/main/res/values-night-v31/styles.xml
index 38a3a8f0..5fef228c 100644
--- a/comwell_key_app/android/app/src/main/res/values-night-v31/styles.xml
+++ b/comwell_key_app/android/app/src/main/res/values-night-v31/styles.xml
@@ -4,10 +4,8 @@
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
@@ -17,8 +15,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>
diff --git a/comwell_key_app/android/app/src/main/res/values-night/styles.xml b/comwell_key_app/android/app/src/main/res/values-night/styles.xml
index 8d7994ca..dbc9ea9f 100644
--- a/comwell_key_app/android/app/src/main/res/values-night/styles.xml
+++ b/comwell_key_app/android/app/src/main/res/values-night/styles.xml
@@ -7,10 +7,8 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
@@ -20,8 +18,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>
diff --git a/comwell_key_app/android/app/src/main/res/values-v31/styles.xml b/comwell_key_app/android/app/src/main/res/values-v31/styles.xml
index 6d0ae2b0..d0a68e92 100644
--- a/comwell_key_app/android/app/src/main/res/values-v31/styles.xml
+++ b/comwell_key_app/android/app/src/main/res/values-v31/styles.xml
@@ -4,10 +4,8 @@
<style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
@@ -17,8 +15,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
</style>
</resources>
diff --git a/comwell_key_app/android/app/src/main/res/values/styles.xml b/comwell_key_app/android/app/src/main/res/values/styles.xml
index 9195c046..0d1fa8fc 100644
--- a/comwell_key_app/android/app/src/main/res/values/styles.xml
+++ b/comwell_key_app/android/app/src/main/res/values/styles.xml
@@ -7,11 +7,8 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
- <item name="android:enforceNavigationBarContrast">false</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
@@ -21,9 +18,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
- <item name="android:windowDrawsSystemBarBackgrounds">true</item>
- <item name="android:statusBarColor">@android:color/transparent</item>
- <item name="android:navigationBarColor">@android:color/transparent</item>
- <item name="android:enforceNavigationBarContrast">false</item>
</style>
</resources>
diff --git a/comwell_key_app/lib/main.dart b/comwell_key_app/lib/main.dart
index a20fce89..90a9076a 100644
--- a/comwell_key_app/lib/main.dart
+++ b/comwell_key_app/lib/main.dart
@@ -53,7 +53,6 @@ void runMainApp(FirebaseOptions firebaseOptions) async {
//Setting SysemUIOverlay
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-
statusBarColor: Colors.transparent,
statusBarBrightness: Brightness.dark,
systemStatusBarContrastEnforced: false,
@@ -64,7 +63,7 @@ void runMainApp(FirebaseOptions firebaseOptions) async {
statusBarIconBrightness: Brightness.dark));
//Setting SystmeUIMode to edgeToEdge
- SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
+ //SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge, overlays: [SystemUiOverlay.top, SystemUiOverlay.bottom]);
runApp(SentryWidget(
child: EasyLocalization(
supportedLocales: const [Locale('en', 'US'), Locale('da', 'DK')],
diff --git a/comwell_key_app/lib/overview/overview_page.dart b/comwell_key_app/lib/overview/overview_page.dart
index 566d3841..910d9db7 100644
--- a/comwell_key_app/lib/overview/overview_page.dart
+++ b/comwell_key_app/lib/overview/overview_page.dart
@@ -8,6 +8,7 @@ import 'package:comwell_key_app/routing/app_routes.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
@@ -28,6 +29,18 @@ class OverviewTabViewState extends State<OverviewPage>
_tabController = TabController(length: 3, vsync: this);
final OverviewCubit overviewCubit = BlocProvider.of<OverviewCubit>(context);
overviewCubit.fetchBookings();
+
+ // Set specific system UI overlay style for this page
+ SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+ statusBarColor: Colors.transparent,
+ statusBarBrightness: Brightness.dark,
+ systemStatusBarContrastEnforced: false,
+ systemNavigationBarColor: Colors.transparent,
+ systemNavigationBarDividerColor: Colors.transparent,
+ systemNavigationBarContrastEnforced: false,
+ systemNavigationBarIconBrightness: Brightness.dark,
+ statusBarIconBrightness: Brightness.dark,
+ ));
}
@override
@@ -56,8 +69,7 @@ class OverviewTabViewState extends State<OverviewPage>
appBar: const ComwellAppBar(
shouldShowBackButton: false,
),
- body: SafeArea(
- child: Column(
+ body: Column(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 16),
@@ -129,7 +141,7 @@ class OverviewTabViewState extends State<OverviewPage>
),
],
),
- ),
+
);
},
),