🐛 fix(web): add kIsWeb before Platform calls

Orange-OpenSource · Mar 15, 2024 · 442f20b · 442f20b
1 parent 974b8c1
commit 442f20b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/app/lib/ui/about/detail/about_file_screen.dart b/app/lib/ui/about/detail/about_file_screen.dart
@@ -13,6 +13,7 @@
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:markdown/markdown.dart' as md;
@@ -317,10 +318,14 @@ String convertToHtml(
   var result = "<html>";
   result += head;
 
-  if (Platform.isIOS) {
-    result += cssApple;
-  } else if (Platform.isAndroid) {
-    result += cssAndroid;
+  if (!kIsWeb) {
+    if (Platform.isIOS) {
+      result += cssApple;
+    } else {
+      if (Platform.isAndroid) {
+        result += cssAndroid;
+      }
+    }
   }
 
   result += "</head>";

diff --git a/app/lib/ui/components/textfields/textfield.dart b/app/lib/ui/components/textfields/textfield.dart
@@ -13,6 +13,7 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/ods_flutter_app_localizations.dart';
 import 'package:ods_flutter/components/chips/ods_choice_chips.dart';
@@ -130,7 +131,7 @@ class _BodyState extends State<_Body> {
     ///Keyboard action
     switch (customizationState?.selectedKeyboardAction) {
       case KeyboardActionEnum.none:
-        if (Platform.isAndroid) {
+        if (kIsWeb || Platform.isAndroid) {
           keyboardAction = TextInputAction.none;
         } else if (Platform.isIOS) {
           keyboardAction = TextInputAction.unspecified;
@@ -152,7 +153,7 @@ class _BodyState extends State<_Body> {
         keyboardAction = TextInputAction.send;
         break;
       case KeyboardActionEnum.previous:
-        if (Platform.isAndroid) {
+        if (kIsWeb || Platform.isAndroid) {
           keyboardAction = TextInputAction.previous;
         }
         break;

diff --git a/app/lib/ui/components/textfields/textfield_password.dart b/app/lib/ui/components/textfields/textfield_password.dart
@@ -13,6 +13,7 @@
 import 'dart:io';
 import 'dart:math';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/ods_flutter_app_localizations.dart';
 import 'package:ods_flutter/components/chips/ods_choice_chips.dart';
@@ -129,7 +130,7 @@ class _BodyState extends State<_Body> {
     ///Keyboard action
     switch (customizationState?.selectedKeyboardAction) {
       case KeyboardActionEnum.none:
-        if (Platform.isAndroid) {
+        if (kIsWeb || Platform.isAndroid) {
           keyboardAction = TextInputAction.none;
         } else if (Platform.isIOS) {
           keyboardAction = TextInputAction.unspecified;
@@ -151,7 +152,7 @@ class _BodyState extends State<_Body> {
         keyboardAction = TextInputAction.send;
         break;
       case KeyboardActionEnum.previous:
-        if (Platform.isAndroid) {
+        if (!kIsWeb && Platform.isAndroid) {
           keyboardAction = TextInputAction.previous;
         }
         break;

diff --git a/app/lib/ui/guidelines/typography/guideline_typography_screen.dart b/app/lib/ui/guidelines/typography/guideline_typography_screen.dart
@@ -12,6 +12,7 @@
 
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/ods_flutter_app_localizations.dart';
 import 'package:ods_flutter/components/divider/ods_divider.dart';
@@ -85,7 +86,7 @@ class GuidelineTypographyScreen extends StatelessWidget {
               padding: EdgeInsets.all(spacingM),
               child: Column(
                 children: [
-                  Platform.isAndroid
+                  kIsWeb || Platform.isAndroid
                       ? Text(
                           AppLocalizations.of(context)!
                               .guidelinesTypographyAndroidDescription,

diff --git a/library/lib/components/sheets_bottom/ods_sheets_bottom.dart b/library/lib/components/sheets_bottom/ods_sheets_bottom.dart
@@ -12,6 +12,7 @@
 
 import 'dart:io';
 
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:ods_flutter/guidelines/spacings.dart';
 
@@ -45,7 +46,7 @@ class _OdsSheetsBottomState extends State<OdsSheetsBottom> {
 
   @override
   Widget build(BuildContext context) {
-    double collapsedHeight = Platform.isAndroid ? 80 : 91;
+    double collapsedHeight = !kIsWeb && Platform.isAndroid ? 80 : 91;
 
     return Container(
       decoration: BoxDecoration(