6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 696a919f
Changed files
.../android/app/src/main/res/values-night-v31/styles.xml | 7 ++++++- comwell_key_app/android/app/src/main/res/values-night/styles.xml | 7 ++++++- comwell_key_app/android/app/src/main/res/values-v31/styles.xml | 7 ++++++- comwell_key_app/android/app/src/main/res/values/styles.xml | 9 ++++++++- comwell_key_app/lib/main.dart | 7 ++++--- comwell_key_app/lib/profile/components/logout_dialog_widget.dart | 1 - comwell_key_app/lib/services/api.dart | 2 -- 7 files changed, 30 insertions(+), 10 deletions(-)
Diff
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 5fef228c..38a3a8f0 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,8 +4,10 @@
<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">false</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">true</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
@@ -15,5 +17,8 @@
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 dbc9ea9f..8d7994ca 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,8 +7,10 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">true</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
@@ -18,5 +20,8 @@
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 d0a68e92..6d0ae2b0 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,8 +4,10 @@
<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">false</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">true</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
@@ -15,5 +17,8 @@
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 0d1fa8fc..9195c046 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,8 +7,11 @@
<item name="android:windowBackground">@drawable/launch_background</item>
<item name="android:forceDarkAllowed">false</item>
<item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">true</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
@@ -18,5 +21,9 @@
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 44317340..a20fce89 100644
--- a/comwell_key_app/lib/main.dart
+++ b/comwell_key_app/lib/main.dart
@@ -53,17 +53,18 @@ void runMainApp(FirebaseOptions firebaseOptions) async {
//Setting SysemUIOverlay
SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+
statusBarColor: Colors.transparent,
statusBarBrightness: Brightness.dark,
- systemStatusBarContrastEnforced: true,
+ systemStatusBarContrastEnforced: false,
systemNavigationBarColor: Colors.transparent,
systemNavigationBarDividerColor: Colors.transparent,
+ systemNavigationBarContrastEnforced: false,
systemNavigationBarIconBrightness: Brightness.dark,
statusBarIconBrightness: Brightness.dark));
//Setting SystmeUIMode to edgeToEdge
- SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge,
- overlays: [SystemUiOverlay.top]);
+ SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
runApp(SentryWidget(
child: EasyLocalization(
supportedLocales: const [Locale('en', 'US'), Locale('da', 'DK')],
diff --git a/comwell_key_app/lib/profile/components/logout_dialog_widget.dart b/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
index af3afc4e..26a17cde 100644
--- a/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
+++ b/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
@@ -1,5 +1,4 @@
import 'package:comwell_key_app/profile/cubit/profile_cubit.dart';
-import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
diff --git a/comwell_key_app/lib/services/api.dart b/comwell_key_app/lib/services/api.dart
index 6349eeb3..2803ff06 100644
--- a/comwell_key_app/lib/services/api.dart
+++ b/comwell_key_app/lib/services/api.dart
@@ -12,7 +12,6 @@ import 'package:comwell_key_app/services/models/user_dto.dart';
import 'package:comwell_key_app/services/utils/api_endpoints.dart';
import 'package:comwell_key_app/utils/json.dart';
import 'package:dio/dio.dart';
-import 'package:flutter/material.dart';
import 'adyen/stored_payment_methods_response.dart';
@@ -39,7 +38,6 @@ class Api {
Future<StoredPaymentsResponse?> getPaymentMethods() async {
final response = await dio.get<Json>(ApiEndpoints.storedPaymentMethods);
- print("response=$response");
return StoredPaymentsResponse.fromJson(response.data!);
}